Move selection code into content/ module.

Currently, selection code (SelectionBoxEfl, SelectionControllerEfl,
SelectionHandleEfl and SelectionMagnifierEfl) are into ui/base
directory.

But those objects are used in content and are even defined in namespace
content. So those files definitely belong in content/ module.

Bug: http://107.108.218.239/bugzilla/show_bug.cgi?id=13303
Reviewed by: Antonio Gomes, SeungSeop Park

Change-Id: Iae3f7e76978223cec4d5925c915d0fb529e1290c
Signed-off-by: Arnaud Renevier <a.renevier@samsung.com>

diff --git a/tizen_src/chromium_impl/content/browser/renderer_host/render_widget_host_view_efl.h b/tizen_src/chromium_impl/content/browser/renderer_host/render_widget_host_view_efl.h
index 1465542..d448fd7 100644 (file)
--- a/tizen_src/chromium_impl/content/browser/renderer_host/render_widget_host_view_efl.h
+++ b/tizen_src/chromium_impl/content/browser/renderer_host/render_widget_host_view_efl.h
@@ -33,10 +33,10 @@
 #include "content/browser/compositor/owned_mailbox.h"
 #include "content/browser/renderer_host/context_factory_efl.h"
 #include "content/browser/renderer_host/render_widget_host_view_base.h"
+#include "content/browser/selection/selection_controller_efl.h"
 #include "gpu/command_buffer/common/mailbox.h"
 #include "ui/base/ime/composition_text.h"
 #include "ui/base/ime/text_input_client.h"
-#include "ui/base/selection/selection_controller_efl.h"
 #include "ui/compositor/layer_owner.h"
 #include "ui/events/gestures/gesture_types.h"
 #include "ui/events/gestures/gesture_recognizer.h"

diff --git a/tizen_src/chromium_impl/ui/base/selection/selection_box_efl.cc b/tizen_src/chromium_impl/content/browser/selection/selection_box_efl.cc
similarity index 97%
rename from tizen_src/chromium_impl/ui/base/selection/selection_box_efl.cc
rename to tizen_src/chromium_impl/content/browser/selection/selection_box_efl.cc
index e5b2c02..6f92b29 100644 (file)
--- a/tizen_src/chromium_impl/ui/base/selection/selection_box_efl.cc
+++ b/tizen_src/chromium_impl/content/browser/selection/selection_box_efl.cc
@@ -2,8 +2,9 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
+#include "selection_box_efl.h"
+
 #include "base/trace_event/trace_event.h"
-#include "ui/base/selection/selection_box_efl.h"
 
 namespace content {
 

diff --git a/tizen_src/chromium_impl/ui/base/selection/selection_box_efl.h b/tizen_src/chromium_impl/content/browser/selection/selection_box_efl.h
similarity index 100%
rename from tizen_src/chromium_impl/ui/base/selection/selection_box_efl.h
rename to tizen_src/chromium_impl/content/browser/selection/selection_box_efl.h

diff --git a/tizen_src/chromium_impl/ui/base/selection/selection_controller_efl.cc b/tizen_src/chromium_impl/content/browser/selection/selection_controller_efl.cc
similarity index 100%
rename from tizen_src/chromium_impl/ui/base/selection/selection_controller_efl.cc
rename to tizen_src/chromium_impl/content/browser/selection/selection_controller_efl.cc

diff --git a/tizen_src/chromium_impl/ui/base/selection/selection_controller_efl.h b/tizen_src/chromium_impl/content/browser/selection/selection_controller_efl.h
similarity index 97%
rename from tizen_src/chromium_impl/ui/base/selection/selection_controller_efl.h
rename to tizen_src/chromium_impl/content/browser/selection/selection_controller_efl.h
index c316fae..ae65d49 100644 (file)
--- a/tizen_src/chromium_impl/ui/base/selection/selection_controller_efl.h
+++ b/tizen_src/chromium_impl/content/browser/selection/selection_controller_efl.h
@@ -9,10 +9,10 @@
 
 #include "base/memory/scoped_ptr.h"
 #include "base/strings/string16.h"
+#include "content/browser/selection/selection_box_efl.h"
+#include "content/browser/selection/selection_handle_efl.h"
+#include "content/browser/selection/selection_magnifier_efl.h"
 #include "third_party/WebKit/public/web/WebInputEvent.h"
-#include "ui/base/selection/selection_box_efl.h"
-#include "ui/base/selection/selection_handle_efl.h"
-#include "ui/base/selection/selection_magnifier_efl.h"
 #include "ui/events/event_constants.h"
 #include "ui/gfx/range/range.h"
 #include "ui/gfx/geometry/rect.h"

diff --git a/tizen_src/chromium_impl/ui/base/selection/selection_handle_efl.cc b/tizen_src/chromium_impl/content/browser/selection/selection_handle_efl.cc
similarity index 98%
rename from tizen_src/chromium_impl/ui/base/selection/selection_handle_efl.cc
rename to tizen_src/chromium_impl/content/browser/selection/selection_handle_efl.cc
index ad9208f..1d8fee8 100644 (file)
--- a/tizen_src/chromium_impl/ui/base/selection/selection_handle_efl.cc
+++ b/tizen_src/chromium_impl/content/browser/selection/selection_handle_efl.cc
@@ -2,13 +2,14 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
+#include "selection_handle_efl.h"
+
 #include <Edje.h>
 #include <Eina.h>
 #include <Elementary.h>
 
 #include "base/trace_event/trace_event.h"
-#include "ui/base/selection/selection_handle_efl.h"
-#include "ui/base/selection/selection_controller_efl.h"
+#include "content/browser/selection/selection_controller_efl.h"
 
 namespace content {
 

diff --git a/tizen_src/chromium_impl/ui/base/selection/selection_handle_efl.h b/tizen_src/chromium_impl/content/browser/selection/selection_handle_efl.h
similarity index 100%
rename from tizen_src/chromium_impl/ui/base/selection/selection_handle_efl.h
rename to tizen_src/chromium_impl/content/browser/selection/selection_handle_efl.h

diff --git a/tizen_src/chromium_impl/ui/base/selection/selection_magnifier_efl.cc b/tizen_src/chromium_impl/content/browser/selection/selection_magnifier_efl.cc
similarity index 98%
rename from tizen_src/chromium_impl/ui/base/selection/selection_magnifier_efl.cc
rename to tizen_src/chromium_impl/content/browser/selection/selection_magnifier_efl.cc
index 676232b..b71ed5b 100644 (file)
--- a/tizen_src/chromium_impl/ui/base/selection/selection_magnifier_efl.cc
+++ b/tizen_src/chromium_impl/content/browser/selection/selection_magnifier_efl.cc
@@ -2,17 +2,17 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "ui/base/selection/selection_magnifier_efl.h"
+#include "selection_magnifier_efl.h"
 
 #include <Elementary.h>
 
 #include "base/path_service.h"
 #include "base/files/file_path.h"
 #include "content/browser/renderer_host/render_widget_host_view_efl.h"
+#include "content/browser/selection/selection_controller_efl.h"
 #include "content/common/paths_efl.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/web_contents.h"
-#include "ui/base/selection/selection_controller_efl.h"
 
 namespace content {
 

diff --git a/tizen_src/chromium_impl/ui/base/selection/selection_magnifier_efl.h b/tizen_src/chromium_impl/content/browser/selection/selection_magnifier_efl.h
similarity index 100%
rename from tizen_src/chromium_impl/ui/base/selection/selection_magnifier_efl.h
rename to tizen_src/chromium_impl/content/browser/selection/selection_magnifier_efl.h

diff --git a/tizen_src/chromium_impl/content/browser/web_contents/web_contents_view_efl.h b/tizen_src/chromium_impl/content/browser/web_contents/web_contents_view_efl.h
index 9c175f6..f156fcf 100644 (file)
--- a/tizen_src/chromium_impl/content/browser/web_contents/web_contents_view_efl.h
+++ b/tizen_src/chromium_impl/content/browser/web_contents/web_contents_view_efl.h
@@ -9,8 +9,8 @@
 #include <Evas.h>
 
 #include "content/browser/renderer_host/render_view_host_delegate_view.h"
+#include "content/browser/selection/selection_controller_efl.h"
 #include "content/browser/web_contents/web_contents_view.h"
-#include "ui/base/selection/selection_controller_efl.h"
 
 namespace content {
 

diff --git a/tizen_src/chromium_impl/content/content_efl.gypi b/tizen_src/chromium_impl/content/content_efl.gypi
index 29b404c..da17ad9 100644 (file)
--- a/tizen_src/chromium_impl/content/content_efl.gypi
+++ b/tizen_src/chromium_impl/content/content_efl.gypi
@@ -165,6 +165,14 @@
           'browser/renderer_host/render_widget_host_view_efl.cc',
           'browser/renderer_host/web_event_factory_efl.h',
           'browser/renderer_host/web_event_factory_efl.cc',
+          'browser/selection/selection_box_efl.cc',
+          'browser/selection/selection_box_efl.h',
+          'browser/selection/selection_controller_efl.cc',
+          'browser/selection/selection_controller_efl.h',
+          'browser/selection/selection_handle_efl.cc',
+          'browser/selection/selection_handle_efl.h',
+          'browser/selection/selection_magnifier_efl.cc',
+          'browser/selection/selection_magnifier_efl.h',
           'public/browser/web_contents_efl_delegate.h',
           'public/browser/web_contents_view_efl_delegate.h',
         ],

diff --git a/tizen_src/chromium_impl/ui/ui_efl.gypi b/tizen_src/chromium_impl/ui/ui_efl.gypi
index bedf88d..f6fb1d7 100644 (file)
--- a/tizen_src/chromium_impl/ui/ui_efl.gypi
+++ b/tizen_src/chromium_impl/ui/ui_efl.gypi
@@ -135,14 +135,6 @@
           'base/clipboard/clipboard_efl.h',
           'base/clipboard/clipboard_helper_efl.cc',
           'base/clipboard/clipboard_helper_efl.h',
-          'base/selection/selection_controller_efl.h',
-          'base/selection/selection_controller_efl.cc',
-          'base/selection/selection_handle_efl.h',
-          'base/selection/selection_handle_efl.cc',
-          'base/selection/selection_box_efl.h',
-          'base/selection/selection_box_efl.cc',
-          'base/selection/selection_magnifier_efl.h',
-          'base/selection/selection_magnifier_efl.cc',
         ],
         'conditions': [
           ['wayland_bringup==1', {

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 86608de..c0c158b 100644 (file)
--- a/tizen_src/ewk/efl_integration/context_menu_controller_efl.cc
+++ b/tizen_src/ewk/efl_integration/context_menu_controller_efl.cc
@@ -12,6 +12,7 @@
 #include "common/web_contents_utils.h"
 #include "context_menu_controller_efl.h"
 #include "content/browser/renderer_host/render_widget_host_view_efl.h"
+#include "content/browser/selection/selection_controller_efl.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/download_manager.h"
 #include "content/public/browser/navigation_entry.h"
@@ -21,7 +22,6 @@
 #include "content/common/paths_efl.h"
 #include "third_party/WebKit/public/platform/WebReferrerPolicy.h"
 #include "ui/base/clipboard/clipboard.h"
-#include "ui/base/selection/selection_controller_efl.h"
 #include "private/ewk_context_menu_private.h"
 
 #if defined(OS_TIZEN_MOBILE)

diff --git a/tizen_src/ewk/efl_integration/eweb_view.h b/tizen_src/ewk/efl_integration/eweb_view.h
index f2ec412..09450f5 100644 (file)
--- a/tizen_src/ewk/efl_integration/eweb_view.h
+++ b/tizen_src/ewk/efl_integration/eweb_view.h
@@ -24,6 +24,7 @@
 #include "content/public/common/context_menu_params.h"
 #include "content/public/common/file_chooser_params.h"
 #include "content/browser/renderer_host/event_with_latency_info.h"
+#include "content/browser/selection/selection_controller_efl.h"
 #include "content/common/input/input_event_ack_state.h"
 #include "content/public/browser/navigation_controller.h"
 #include "content/public/browser/quota_permission_context.h"
@@ -44,7 +45,6 @@
 #include "public/ewk_view.h"
 #include "eweb_view_callbacks.h"
 #include "scroll_detector.h"
-#include "ui/base/selection/selection_controller_efl.h"
 #include "web_contents_delegate_efl.h"
 #include "context_menu_controller_efl.h"
 #include "file_chooser_controller_efl.h"