Commit 54c9e082 authored by Pedro Amaral's avatar Pedro Amaral Committed by Commit Bot

Moving native android selection code to its own directory

Moving native android selection code to new director to allow
amaralp@ to be OWNER of them.

Change-Id: I91abd703303799745855cf40a7002c60c924197d
Reviewed-on: https://chromium-review.googlesource.com/988798Reviewed-by: default avatarBo <boliu@chromium.org>
Commit-Queue: Pedro Amaral <amaralp@chromium.org>
Cr-Commit-Position: refs/heads/master@{#547456}
parent a8766bb5
......@@ -2033,8 +2033,6 @@ jumbo_source_set("browser") {
"accessibility/captioning_controller.h",
"accessibility/web_contents_accessibility_android.cc",
"accessibility/web_contents_accessibility_android.h",
"android/composited_touch_handle_drawable.cc",
"android/composited_touch_handle_drawable.h",
"android/content_view_core.cc",
"android/content_view_core.h",
"android/content_view_render_view.cc",
......@@ -2079,10 +2077,12 @@ jumbo_source_set("browser") {
"android/render_widget_host_connector.h",
"android/select_popup.cc",
"android/select_popup.h",
"android/selection_popup_controller.cc",
"android/selection_popup_controller.h",
"android/smart_selection_client.cc",
"android/smart_selection_client.h",
"android/selection/composited_touch_handle_drawable.cc",
"android/selection/composited_touch_handle_drawable.h",
"android/selection/selection_popup_controller.cc",
"android/selection/selection_popup_controller.h",
"android/selection/smart_selection_client.cc",
"android/selection/smart_selection_client.h",
"android/synchronous_compositor_browser_filter.cc",
"android/synchronous_compositor_browser_filter.h",
"android/synchronous_compositor_host.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.
#include "content/browser/android/composited_touch_handle_drawable.h"
#include "content/browser/android/selection/composited_touch_handle_drawable.h"
#include "base/lazy_instance.h"
#include "base/logging.h"
......
......@@ -2,8 +2,8 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
#ifndef CONTENT_BROWSER_ANDROID_COMPOSITED_TOUCH_HANDLE_DRAWABLE_H_
#define CONTENT_BROWSER_ANDROID_COMPOSITED_TOUCH_HANDLE_DRAWABLE_H_
#ifndef CONTENT_BROWSER_ANDROID_SELECTION_COMPOSITED_TOUCH_HANDLE_DRAWABLE_H_
#define CONTENT_BROWSER_ANDROID_SELECTION_COMPOSITED_TOUCH_HANDLE_DRAWABLE_H_
#include "ui/touch_selection/touch_handle.h"
......@@ -47,4 +47,4 @@ class CompositedTouchHandleDrawable : public ui::TouchHandleDrawable {
} // namespace content
#endif // CONTENT_BROWSER_ANDROID_COMPOSITED_TOUCH_HANDLE_DRAWABLE_H_
#endif // CONTENT_BROWSER_ANDROID_SELECTION_COMPOSITED_TOUCH_HANDLE_DRAWABLE_H_
......@@ -2,12 +2,12 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
#include "content/browser/android/selection_popup_controller.h"
#include "content/browser/android/selection/selection_popup_controller.h"
#include "base/android/jni_android.h"
#include "base/android/jni_string.h"
#include "base/android/scoped_java_ref.h"
#include "content/browser/android/composited_touch_handle_drawable.h"
#include "content/browser/android/selection/composited_touch_handle_drawable.h"
#include "content/browser/renderer_host/render_widget_host_view_android.h"
#include "content/browser/web_contents/web_contents_impl.h"
#include "content/browser/web_contents/web_contents_view_android.h"
......
......@@ -2,8 +2,8 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
#ifndef CONTENT_BROWSER_ANDROID_SELECTION_POPUP_CONTROLLER_H_
#define CONTENT_BROWSER_ANDROID_SELECTION_POPUP_CONTROLLER_H_
#ifndef CONTENT_BROWSER_ANDROID_SELECTION_SELECTION_POPUP_CONTROLLER_H_
#define CONTENT_BROWSER_ANDROID_SELECTION_SELECTION_POPUP_CONTROLLER_H_
#include <jni.h>
......@@ -63,4 +63,4 @@ class SelectionPopupController : public RenderWidgetHostConnector {
} // namespace content
#endif // CONTENT_BROWSER_ANDROID_SELECTION_POPUP_CONTROLLER_H_
#endif // CONTENT_BROWSER_ANDROID_SELECTION_SELECTION_POPUP_CONTROLLER_H_
......@@ -2,7 +2,7 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
#include "content/browser/android/smart_selection_client.h"
#include "content/browser/android/selection/smart_selection_client.h"
#include "base/android/jni_android.h"
#include "base/android/jni_string.h"
......
......@@ -2,8 +2,8 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
#ifndef CONTENT_BROWSER_ANDROID_SMART_SELECTION_CLIENT_H_
#define CONTENT_BROWSER_ANDROID_SMART_SELECTION_CLIENT_H_
#ifndef CONTENT_BROWSER_ANDROID_SELECTION_SMART_SELECTION_CLIENT_H_
#define CONTENT_BROWSER_ANDROID_SELECTION_SMART_SELECTION_CLIENT_H_
#include <jni.h>
......@@ -57,4 +57,4 @@ class SmartSelectionClient {
} // namespace content
#endif // CONTENT_BROWSER_ANDROID_SMART_SELECTION_CLIENT_H_
#endif // CONTENT_BROWSER_ANDROID_SELECTION_SMART_SELECTION_CLIENT_H_
......@@ -34,7 +34,7 @@
#include "content/browser/android/gesture_listener_manager.h"
#include "content/browser/android/ime_adapter_android.h"
#include "content/browser/android/overscroll_controller_android.h"
#include "content/browser/android/selection_popup_controller.h"
#include "content/browser/android/selection/selection_popup_controller.h"
#include "content/browser/android/synchronous_compositor_host.h"
#include "content/browser/android/tap_disambiguator.h"
#include "content/browser/android/text_suggestion_host_android.h"
......
......@@ -14,7 +14,7 @@
#include "content/browser/android/content_view_core.h"
#include "content/browser/android/gesture_listener_manager.h"
#include "content/browser/android/select_popup.h"
#include "content/browser/android/selection_popup_controller.h"
#include "content/browser/android/selection/selection_popup_controller.h"
#include "content/browser/frame_host/interstitial_page_impl.h"
#include "content/browser/renderer_host/display_util.h"
#include "content/browser/renderer_host/render_view_host_factory.h"
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment