wip: Aura-specific implementation of unified touch selection: touch_selection

content/browser/renderer_host/render_widget_host_view_android.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "content/browser/renderer_host/render_widget_host_view_android.h"
 
 #include <android/bitmap.h>
 
 #include "base/android/build_info.h"
 #include "base/basictypes.h"
@@ skipping 68 matching lines @@
 #include "ui/android/window_android_compositor.h"
 #include "ui/events/gesture_detection/gesture_provider_config_helper.h"
 #include "ui/events/gesture_detection/motion_event.h"
 #include "ui/gfx/android/device_display_info.h"
 #include "ui/gfx/android/java_bitmap.h"
 #include "ui/gfx/android/view_configuration.h"
 #include "ui/gfx/display.h"
 #include "ui/gfx/geometry/dip_util.h"
 #include "ui/gfx/geometry/size_conversions.h"
 #include "ui/gfx/screen.h"
-#include "ui/touch_selection/touch_selection_controller.h"
 
 namespace content {
 
 namespace {
 
 void SatisfyCallback(cc::SurfaceManager* manager,
                      cc::SurfaceSequence sequence) {
   std::vector<uint32_t> sequences;
   sequences.push_back(sequence.sequence);
   manager->DidSatisfySequences(sequence.id_namespace, &sequences);
@@ skipping 169 matching lines @@
     latency_info.AddLatencyNumberWithTimestamp(
         ui::INPUT_EVENT_LATENCY_ORIGINAL_COMPONENT,
         0,
         0,
         base::TimeTicks() + base::TimeDelta::FromMicroseconds(time_micros),
         1);
   }
   return latency_info;
 }
 
-scoped_ptr<ui::TouchSelectionController> CreateSelectionController(
-    ui::TouchSelectionControllerClient* client,
+scoped_ptr<ui::TouchSelectionControllerAndroid> CreateSelectionController(
+    ui::TouchSelectionControllerAndroidClient* client,
     ContentViewCore* content_view_core) {
   DCHECK(client);
   DCHECK(content_view_core);
   int tap_timeout_ms = gfx::ViewConfiguration::GetTapTimeoutInMs();
   int touch_slop_pixels = gfx::ViewConfiguration::GetTouchSlopInPixels();
-  bool show_on_tap_for_empty_editable = false;
-  return make_scoped_ptr(new ui::TouchSelectionController(
+  return make_scoped_ptr(new ui::TouchSelectionControllerAndroid(
       client,
       base::TimeDelta::FromMilliseconds(tap_timeout_ms),
-      touch_slop_pixels / content_view_core->GetDpiScale(),
-      show_on_tap_for_empty_editable));
+      touch_slop_pixels / content_view_core->GetDpiScale()));
 }
 
 scoped_ptr<OverscrollControllerAndroid> CreateOverscrollController(
     ContentViewCore* content_view_core) {
   DCHECK(content_view_core);
   ui::WindowAndroid* window = content_view_core->GetWindowAndroid();
   DCHECK(window);
   ui::WindowAndroidCompositor* compositor = window->GetCompositor();
   DCHECK(compositor);
   return make_scoped_ptr(new OverscrollControllerAndroid(
@@ skipping 1145 matching lines @@
   bool is_mobile_optimized = IsMobileOptimizedFrame(frame_metadata);
   gesture_provider_.SetDoubleTapSupportForPageEnabled(!is_mobile_optimized);
 
   if (!content_view_core_)
     return;
 
   if (overscroll_controller_)
     overscroll_controller_->OnFrameMetadataUpdated(frame_metadata);
 
   if (selection_controller_) {
-    selection_controller_->OnSelectionBoundsChanged(
+    selection_controller_->OnSelectionBoundsUpdated(
         ConvertSelectionBound(frame_metadata.selection_start),
         ConvertSelectionBound(frame_metadata.selection_end));
   }
 
   // All offsets and sizes are in CSS pixels.
   content_view_core_->UpdateFrameInfo(
       frame_metadata.root_scroll_offset,
       frame_metadata.page_scale_factor,
       gfx::Vector2dF(frame_metadata.min_page_scale_factor,
                      frame_metadata.max_page_scale_factor),
@@ skipping 299 matching lines @@
   // of the region have been updated, explicitly set the properties now.
   // TODO(jdduke): Remove this workaround when auxiliary paste popup
   // notifications are no longer required, crbug.com/398170.
   ui::SelectionBound insertion_bound;
   insertion_bound.set_type(ui::SelectionBound::CENTER);
   insertion_bound.set_visible(true);
   insertion_bound.SetEdge(point, point);
   selection_controller_->HideAndDisallowShowingAutomatically();
   selection_controller_->OnSelectionEditable(true);
   selection_controller_->OnSelectionEmpty(true);
-  selection_controller_->OnSelectionBoundsChanged(insertion_bound,
+  selection_controller_->OnSelectionBoundsUpdated(insertion_bound,
                                                   insertion_bound);
   selection_controller_->AllowShowingFromCurrentSelection();
 }
 
 SkColor RenderWidgetHostViewAndroid::GetCachedBackgroundColor() const {
   return cached_background_color_;
 }
 
 void RenderWidgetHostViewAndroid::DidOverscroll(
     const DidOverscrollParams& params) {
@@ skipping 259 matching lines @@
   results->orientationAngle = display.RotationAsDegree();
   results->orientationType =
       RenderWidgetHostViewBase::GetOrientationTypeForMobile(display);
   gfx::DeviceDisplayInfo info;
   results->depth = info.GetBitsPerPixel();
   results->depthPerComponent = info.GetBitsPerComponent();
   results->isMonochrome = (results->depthPerComponent == 0);
 }
 
 } // namespace content