From 695063683e3f8dd6f4b554365a40043f97fe0c3b Mon Sep 17 00:00:00 2001 From: Junghwan Date: Tue, 4 Sep 2012 15:04:27 +0900 Subject: Remove function of meta tag [Title] Remove function of meta tag [Issue#] N/A [Problem] N/A [Cause] N/A [Solution] Remove function of meta tag [Team] Browser UI [Developer] Junghwan kang [Request] N/A Change-Id: Ib6e91c35b70566a75672128906ac2c63d86eba0b --- src/browser-view/browser-view.cpp | 54 +-------------------------------------- src/browser-view/browser-view.h | 15 ----------- 2 files changed, 1 insertion(+), 68 deletions(-) (limited to 'src/browser-view') diff --git a/src/browser-view/browser-view.cpp b/src/browser-view/browser-view.cpp index ac81d56f..9489ba0d 100755 --- a/src/browser-view/browser-view.cpp +++ b/src/browser-view/browser-view.cpp @@ -90,9 +90,6 @@ Browser_View::Browser_View(Evas_Object *win, Evas_Object *navi_bar, Evas_Object ,m_find_word(NULL) ,m_scissorbox_view(NULL) ,m_share_controlbar_button(NULL) -#ifdef USE_META_TAG - ,m_meta_tag(NULL) -#endif ,m_context_menu(NULL) ,m_multi_window_button(NULL) ,m_new_window_button(NULL) @@ -181,12 +178,6 @@ Browser_View::~Browser_View() m_multi_window_rotate_timer = NULL; } #endif -#ifdef USE_META_TAG - if (m_meta_tag) { - delete m_meta_tag; - m_meta_tag = NULL; - } -#endif #ifdef ZOOM_BUTTON if (m_zoom_in_button) evas_object_del(m_zoom_in_button); @@ -242,13 +233,7 @@ Eina_Bool Browser_View::init(void) BROWSER_LOGE("new Browser_Context_Menu failed"); return EINA_FALSE; } -#ifdef USE_META_TAG - m_meta_tag = new(nothrow) Browser_Meta_Tag(); - if (!m_meta_tag) { - BROWSER_LOGE("new Browser_Meta_Tag failed"); - return EINA_FALSE; - } -#endif + UG_INIT_EFL(m_win, UG_OPT_INDICATOR_ENABLE); char *last_url = NULL; @@ -1934,43 +1919,6 @@ void Browser_View::__forward_cb(void *data, Evas_Object *obj, void *event_info) ewk_view_forward(browser_view->m_focused_window->m_ewk_view); } -#ifdef USE_META_TAG -void Browser_View::__web_app_capable_get_cb(Eina_Bool capable, void* user_data) -{ - BROWSER_LOGD("[%s]", __func__); - - if (!user_data) - return; - - Browser_View *browser_view = (Browser_View *)user_data; - Evas_Object *webkit = browser_view->m_focused_window->m_ewk_view; - if (capable) { - ewk_view_web_application_icon_url_get(webkit, __web_app_icon_url_get_cb, browser_view); - } -} - -void Browser_View::__web_app_icon_url_get_cb(const char* icon_url, void* user_data) -{ - BROWSER_LOGD("icon_url:%s", icon_url); - - if (!user_data) - return; - - Browser_View *browser_view = (Browser_View *)user_data; - - /* make configure file */ - browser_view->m_meta_tag->create_config_xml((browser_view->get_url()).c_str(), browser_view->get_title().c_str(), NULL); - if (!icon_url || strlen(icon_url) == 0) { - BROWSER_LOGD("Failed to get webapp icon url, make widget with default icon"); - browser_view->m_meta_tag->wgt_install(NULL); - } else { - BROWSER_LOGD("Succeed to get webapp icon url, make widget after icon downloaded"); - /* get icon */ - browser_view->m_meta_tag->request_download_icon(icon_url); - } -} -#endif - void Browser_View::__url_editfield_share_clicked_cb(void *data, Evas_Object *obj, void *event_info) { BROWSER_LOGD("[%s]", __func__); diff --git a/src/browser-view/browser-view.h b/src/browser-view/browser-view.h index 2dfe5945..bfdba80e 100755 --- a/src/browser-view/browser-view.h +++ b/src/browser-view/browser-view.h @@ -19,9 +19,6 @@ #define BROWSER_VIEW_H #include "browser-common-view.h" -#ifdef USE_META_TAG -#include "browser-meta-tag.h" -#endif #include "browser-config.h" #if defined(FEATURE_MOST_VISITED_SITES) #include "browser-most-visited.h" @@ -32,9 +29,6 @@ class Browser_Bookmark_DB; class Browser_Context_Menu; class Browser_Class; class Browser_Find_Word; -#ifdef USE_META_TAG -class Browser_Meta_Tag; -#endif class Browser_Multi_Window_View; class Browser_Scissorbox_View; class Browser_Settings_Class; @@ -216,12 +210,6 @@ private: /* elm transit callback functions */ static void __new_window_transit_finished_cb(void *data, Elm_Transit *transit); -#ifdef USE_META_TAG - static void __web_app_capable_get_cb(Eina_Bool capable, void* user_data); - static void __web_app_icon_url_get_cb(const char* icon_url, void* user_data); - -#endif - /* normal member functions */ Eina_Bool _create_main_layout(void); Evas_Object *_create_url_layout(void); @@ -352,9 +340,6 @@ private: int m_rotate_degree; Ecore_Timer *m_multi_window_rotate_timer; Eina_Bool m_is_rotated; -#endif -#ifdef USE_META_TAG - Browser_Meta_Tag *m_meta_tag; #endif Eina_Bool m_is_full_screen; #ifdef ZOOM_BUTTON -- cgit v1.2.3