fixup! Replacing deprecated 'efl-assist' with 'efl-extension'

This patch changes the codes in order to use the 'efl-extension'
in both Mobile and TV profile.

Reviewed by: g.czajkowski, sns.park

Change-Id: I4db84b345ebb7360459695944342412fe2145c1f
Signed-off-by: Youngcheol Kang <ychul.kang@samsung.com>

diff --git a/tizen_src/build/system.gyp b/tizen_src/build/system.gyp
index 56aa566..e75a59f 100644 (file)
--- a/tizen_src/build/system.gyp
+++ b/tizen_src/build/system.gyp
@@ -183,7 +183,7 @@
       'target_name': 'efl-extension',
       'type': 'none',
       'conditions': [
-        ['building_for_tizen_mobile==1', {
+        ['building_for_tizen==1', {
           'direct_dependent_settings': {
             'cflags': [
               '<!@(<(pkg-config) --cflags efl-extension)',

diff --git a/tizen_src/chromium_impl/components/js_dialogs_efl/javascript_modal_dialog_efl.cc b/tizen_src/chromium_impl/components/js_dialogs_efl/javascript_modal_dialog_efl.cc
index 3909e1f..edccc86 100644 (file)
--- a/tizen_src/chromium_impl/components/js_dialogs_efl/javascript_modal_dialog_efl.cc
+++ b/tizen_src/chromium_impl/components/js_dialogs_efl/javascript_modal_dialog_efl.cc
@@ -9,8 +9,8 @@
 #include "base/strings/utf_string_conversions.h"
 #include "content/public/browser/web_contents.h"
 
-#ifdef OS_TIZEN_MOBILE
-#include <efl_assist.h>
+#ifdef OS_TIZEN
+#include <efl_extension.h>
 #endif
 
 namespace content {
@@ -51,7 +51,7 @@ JavaScriptModalDialogEfl::JavaScriptModalDialogEfl(
   InitContent(type, message_text, default_prompt_text);
   InitButtons(type);
 
-#if defined(OS_TIZEN_MOBILE)
+#if defined(OS_TIZEN)
   eext_object_event_callback_add(popup_, EEXT_CALLBACK_BACK,
       &OnCancelButtonPressed, this);
 #endif

diff --git a/tizen_src/ewk/efl_integration/browser/inputpicker/InputPicker.cc b/tizen_src/ewk/efl_integration/browser/inputpicker/InputPicker.cc
index 66bbcfc..6fe60b5 100755 (executable)
--- a/tizen_src/ewk/efl_integration/browser/inputpicker/InputPicker.cc
+++ b/tizen_src/ewk/efl_integration/browser/inputpicker/InputPicker.cc
@@ -20,8 +20,6 @@
 #include <Elementary.h>
 #if defined(OS_TIZEN)
 #include <vconf/vconf.h>
-#endif
-#if defined(OS_TIZEN_MOBILE)
 #include <dlfcn.h>
 #include <efl_extension.h>
 extern void* EflExtensionHandle;
@@ -404,7 +402,7 @@ void InputPicker::ShowColorPicker(int r, int g, int b, int alpha) {
       "color,item,selected",
       SelectedColorCallback,
       picker_layout_->color_rect);
-#if defined(OS_TIZEN_MOBILE)
+#if defined(OS_TIZEN)
   eext_object_event_callback_add(picker_layout_->popup, EEXT_CALLBACK_BACK,
       HandleBackKeyColorPicker, this);
 #endif
@@ -618,7 +616,7 @@ void InputPicker::CreatePopupLayout(const char* title, struct tm* currentTime) {
       picker_layout_->popup, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
   elm_object_part_text_set(picker_layout_->popup, "title,text", title);
 
-#if defined(OS_TIZEN_MOBILE)
+#if defined(OS_TIZEN)
   if (EflExtensionHandle) {
     void (*webkit_eext_object_event_callback_add)(
         Evas_Object *, Eext_Callback_Type , Eext_Event_Cb func, void *);
@@ -680,7 +678,7 @@ void InputPicker::CreateDateTimePopupLayout(const char* title, struct tm* curren
       picker_layout_->popup, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
   elm_object_part_text_set(picker_layout_->popup, "title,text", title);
 
-#if defined(OS_TIZEN_MOBILE)
+#if defined(OS_TIZEN)
   if (EflExtensionHandle) {
     void (*webkit_eext_object_event_callback_add)(
         Evas_Object *, Eext_Callback_Type , Eext_Event_Cb func, void *);
@@ -749,7 +747,7 @@ void InputPicker::CreateTimePopupLayout(const char* title, struct tm* currentTim
       picker_layout_->popup, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
   elm_object_part_text_set(picker_layout_->popup, "title,text", title);
 
-#if defined(OS_TIZEN_MOBILE)
+#if defined(OS_TIZEN)
   if (EflExtensionHandle) {
     void (*webkit_eext_object_event_callback_add)(
         Evas_Object *, Eext_Callback_Type , Eext_Event_Cb func, void *);

diff --git a/tizen_src/ewk/efl_integration/browser/javascript_modal_dialog_efl.cc b/tizen_src/ewk/efl_integration/browser/javascript_modal_dialog_efl.cc
index e0af617..5ed201d 100755 (executable)
--- a/tizen_src/ewk/efl_integration/browser/javascript_modal_dialog_efl.cc
+++ b/tizen_src/ewk/efl_integration/browser/javascript_modal_dialog_efl.cc
@@ -10,7 +10,7 @@
 #include "content/common/paths_efl.h"
 #include "eweb_view.h"
 
-#ifdef OS_TIZEN_MOBILE
+#ifdef OS_TIZEN
 #include <efl_extension.h>
 #endif
 
@@ -198,7 +198,7 @@ bool JavaScriptModalDialogEfl::ShowJavaScriptDialog() {
     evas_object_smart_callback_add(ok_button_, "clicked", OkButtonHandlerForConfirm, this);
   }
 
-#if defined(OS_TIZEN_MOBILE)
+#if defined(OS_TIZEN)
   if (type_ == PROMPT || type_ == NAVIGATION)
     eext_object_event_callback_add(popup_, EEXT_CALLBACK_BACK, CancelButtonHandlerForPrompt, this);
   else if (type_ == ALERT)

diff --git a/tizen_src/ewk/efl_integration/browser/selectpicker/popup_picker.cc b/tizen_src/ewk/efl_integration/browser/selectpicker/popup_picker.cc
index fd3c0b6..74e45c0 100644 (file)
--- a/tizen_src/ewk/efl_integration/browser/selectpicker/popup_picker.cc
+++ b/tizen_src/ewk/efl_integration/browser/selectpicker/popup_picker.cc
@@ -18,7 +18,7 @@
 #include <Elementary.h>
 #include <libintl.h>
 #include "ecore_x_wayland_wrapper.h"
-#ifdef OS_TIZEN_MOBILE
+#ifdef OS_TIZEN
 #include <dlfcn.h>
 #include <efl_extension.h>
 extern void* EflExtensionHandle;
@@ -350,7 +350,7 @@ Popup_Picker* popup_picker_new(EWebView* web_view, Evas_Object* parent, Eina_Lis
       "mouse,clicked,1", "elm.image.next_bg", navigateToNext, picker);
   }
 
-#ifdef OS_TIZEN_MOBILE
+#ifdef OS_TIZEN
   if (EflExtensionHandle) {
     void (*webkit_eext_object_event_callback_add)(Evas_Object *,
         Eext_Callback_Type, Eext_Event_Cb func, void *);

diff --git a/tizen_src/ewk/efl_integration/browser/web_view_evas_handler.cc b/tizen_src/ewk/efl_integration/browser/web_view_evas_handler.cc
index 4f6f3c0..1d5ba6d 100644 (file)
--- a/tizen_src/ewk/efl_integration/browser/web_view_evas_handler.cc
+++ b/tizen_src/ewk/efl_integration/browser/web_view_evas_handler.cc
@@ -49,7 +49,7 @@ bool WebViewEvasEventHandler::HandleEvent_KeyUp(
   bool handled = WebViewDelegateEwk::GetInstance().
       RequestHandleEvent_KeyUp(webview_, event_info);
 
-#if defined(OS_TIZEN_MOBILE)
+#if defined(OS_TIZEN)
   return handled;
 #endif
 

diff --git a/tizen_src/ewk/efl_integration/context_menu_controller_efl.cc b/tizen_src/ewk/efl_integration/context_menu_controller_efl.cc
index 42d12e8..fb9e464 100644 (file)
--- a/tizen_src/ewk/efl_integration/context_menu_controller_efl.cc
+++ b/tizen_src/ewk/efl_integration/context_menu_controller_efl.cc
@@ -27,9 +27,6 @@
 
 #if defined(OS_TIZEN)
 #include <app_control.h>
-#endif
-
-#if defined(OS_TIZEN_MOBILE)
 #include <efl_extension.h>
 #endif
 
@@ -473,7 +470,7 @@ bool ContextMenuControllerEfl::ShowContextMenu() {
 #endif
     web_contents_.Focus();
   } else {
-#if defined(OS_TIZEN_MOBILE)
+#if defined(OS_TIZEN)
     eext_object_event_callback_add(popup_, EEXT_CALLBACK_BACK, ContextMenuHWBackKey, this);
     // Workaround. After context menu shows up, there is "unfocused" event fired.
     // evas_object_smart_callback_add(popup_, "unfocused", ContextMenuHWBackKey, this);

diff --git a/tizen_src/ewk/efl_integration/ewk_global_data.cc b/tizen_src/ewk/efl_integration/ewk_global_data.cc
index e8d9da9..a7c6965 100644 (file)
--- a/tizen_src/ewk/efl_integration/ewk_global_data.cc
+++ b/tizen_src/ewk/efl_integration/ewk_global_data.cc
@@ -32,7 +32,7 @@
 #include "message_pump_for_ui_efl.h"
 #include "ui/gfx/screen_efl.h"
 
-#ifdef OS_TIZEN_MOBILE
+#ifdef OS_TIZEN
 #include <dlfcn.h>
 void* EflExtensionHandle = 0;
 #endif
@@ -138,7 +138,7 @@ EwkGlobalData* EwkGlobalData::GetInstance() {
   logging::SetLogItems(true, true, true, true);
 #endif
 
-#ifdef OS_TIZEN_MOBILE
+#ifdef OS_TIZEN
   if (!EflExtensionHandle)
     EflExtensionHandle = dlopen("/usr/lib/libefl-extension.so.0", RTLD_LAZY);
 #endif

diff --git a/tizen_src/ewk/efl_integration/permission_popup_manager.cc b/tizen_src/ewk/efl_integration/permission_popup_manager.cc
index e82c949..c2f28ec 100755 (executable)
--- a/tizen_src/ewk/efl_integration/permission_popup_manager.cc
+++ b/tizen_src/ewk/efl_integration/permission_popup_manager.cc
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#if defined(OS_TIZEN_MOBILE)
+#if defined(OS_TIZEN)
 #include <efl_extension.h>
 #endif
 #include <Elementary.h>
@@ -152,7 +152,7 @@ static void permissionCancelCallback(
   manager->Decide(false);
 }
 
-#if defined(OS_TIZEN_MOBILE)
+#if defined(OS_TIZEN)
 static void permissionHwBackKeyCallback(
     void* data, Evas_Object* obj, void* event_info) {
   PermissionPopupManager* manager = static_cast<PermissionPopupManager*>(data);
@@ -177,7 +177,7 @@ void PermissionPopupManager::ShowPermissionPopup(PermissionPopup* popup) {
   if (!SetLabelText(popup->GetMessage()))
     return;
 
-#if defined(OS_TIZEN_MOBILE)
+#if defined(OS_TIZEN)
   eext_object_event_callback_add(popup_, EEXT_CALLBACK_BACK,
       permissionHwBackKeyCallback, this);
 #endif

diff --git a/tizen_src/ewk/efl_integration/popup_controller_efl.cc b/tizen_src/ewk/efl_integration/popup_controller_efl.cc
index 9b96153..5e63c3c 100644 (file)
--- a/tizen_src/ewk/efl_integration/popup_controller_efl.cc
+++ b/tizen_src/ewk/efl_integration/popup_controller_efl.cc
@@ -20,7 +20,7 @@
 #include <gio/gio.h>
 #endif // OS_TIZEN
 
-#ifdef OS_TIZEN_MOBILE
+#ifdef OS_TIZEN
 #include <efl_extension.h>
 #endif
 
@@ -272,7 +272,7 @@ void PopupControllerEfl::appendItems() {
 void PopupControllerEfl::addCallbacks() {
   // Close popup after tapping on outside of it
   evas_object_smart_callback_add(popup_, "block,clicked", close_cb, this);
-#ifdef OS_TIZEN_MOBILE
+#ifdef OS_TIZEN
   eext_object_event_callback_add(popup_, EEXT_CALLBACK_BACK, close_cb, this);
   evas_object_focus_set(popup_, EINA_TRUE);
 #endif

diff --git a/tizen_src/ewk/efl_webview_app/mini_browser.c b/tizen_src/ewk/efl_webview_app/mini_browser.c
index 6a19378..32423c2 100644 (file)
--- a/tizen_src/ewk/efl_webview_app/mini_browser.c
+++ b/tizen_src/ewk/efl_webview_app/mini_browser.c
@@ -36,7 +36,7 @@
 #include "browser-string.h"
 #include "browser-object.h"
 
-#ifdef OS_TIZEN_MOBILE
+#ifdef OS_TIZEN
 #include <efl_extension.h>
 #endif
 
@@ -542,7 +542,7 @@ Evas_Object* _create_url_bar(Evas_Object *parent, int width, const char *start_u
   evas_object_smart_callback_add(data->url_entry, "clicked", _url_clicked_cb, data);
   #endif
   elm_entry_prediction_allow_set(data->url_entry, EINA_FALSE);
-#ifdef OS_TIZEN_MOBILE
+#ifdef OS_TIZEN
   eext_object_event_callback_add(data->url_entry, EEXT_CALLBACK_BACK, _back_hard_key_cb, data);
 #endif
   // Add imf event

diff --git a/tizen_src/ewk/ubrowser/window_ui.cc b/tizen_src/ewk/ubrowser/window_ui.cc
index bc16d8e..d153618 100644 (file)
--- a/tizen_src/ewk/ubrowser/window_ui.cc
+++ b/tizen_src/ewk/ubrowser/window_ui.cc
@@ -8,7 +8,8 @@
 #include <Elementary.h>
 #include <ewk_context.h>
 #include <ewk_settings.h>
-#if defined(OS_TIZEN_MOBILE)
+
+#ifdef OS_TIZEN
 #include <efl_extension.h>
 #endif
 
@@ -74,7 +75,7 @@ WindowUI::WindowUI(Window& window, Browser& browser)
   elm_box_pack_end(urlbar_, separator);
   evas_object_show(separator);
 
-#if defined(OS_TIZEN_MOBILE)
+#if defined(OS_TIZEN)
   eext_object_event_callback_add(window_.GetEvasObject(), EEXT_CALLBACK_BACK, WindowUI::OnBack, this);
 #endif
 

diff --git a/tizen_src/packaging/chromium-efl.spec b/tizen_src/packaging/chromium-efl.spec
index f6840a7..3c2d275 100644 (file)
--- a/tizen_src/packaging/chromium-efl.spec
+++ b/tizen_src/packaging/chromium-efl.spec
@@ -75,6 +75,7 @@ BuildRequires: pkgconfig(ecore-evas)
 BuildRequires: pkgconfig(ecore-imf)
 BuildRequires: pkgconfig(ecore-imf-evas)
 BuildRequires: pkgconfig(ecore-input)
+BuildRequires: pkgconfig(efl-extension)
 BuildRequires: pkgconfig(elementary)
 BuildRequires: pkgconfig(evas)
 BuildRequires: pkgconfig(feedback)
@@ -145,7 +146,6 @@ BuildRequires: binutils-gold
 # Version Conditions for Each Targets
 %if "%{?chromium_efl_tizen_profile}%{!?chromium_efl_tizen_profile:0}" == "mobile"
 BuildRequires: bzip2-devel
-BuildRequires: pkgconfig(efl-extension)
 BuildRequires: pkgconfig(capi-system-sensor)
 %if "%{?_with_wayland}" != "1"
 BuildRequires: pkgconfig(xdamage)