Reland: Move TouchSelectionController from content to ui

content/browser/android/composited_touch_handle_drawable.cc

 // Copyright 2014 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/android/composited_touch_handle_drawable.h"
 
 #include "base/debug/trace_event.h"
 #include "base/lazy_instance.h"
 #include "base/logging.h"
 #include "cc/layers/ui_resource_layer.h"
@@ skipping 32 matching lines @@
     right_bitmap_ = CreateSkBitmapFromJavaBitmap(
         Java_HandleViewResources_getRightHandleBitmap(env, context));
     center_bitmap_ = CreateSkBitmapFromJavaBitmap(
         Java_HandleViewResources_getCenterHandleBitmap(env, context));
 
     left_bitmap_.setImmutable();
     right_bitmap_.setImmutable();
     center_bitmap_.setImmutable();
   }
 
-  const SkBitmap& GetBitmap(TouchHandleOrientation orientation) {
+  const SkBitmap& GetBitmap(ui::TouchHandleOrientation orientation) {
     DCHECK(loaded_);
     switch (orientation) {
-      case TOUCH_HANDLE_LEFT:
+      case ui::TOUCH_HANDLE_LEFT:
         return left_bitmap_;
-      case TOUCH_HANDLE_RIGHT:
+      case ui::TOUCH_HANDLE_RIGHT:
         return right_bitmap_;
-      case TOUCH_HANDLE_CENTER:
+      case ui::TOUCH_HANDLE_CENTER:
         return center_bitmap_;
-      case TOUCH_HANDLE_ORIENTATION_UNDEFINED:
+      case ui::TOUCH_HANDLE_ORIENTATION_UNDEFINED:
         NOTREACHED() << "Invalid touch handle orientation.";
     };
     return center_bitmap_;
   }
 
  private:
   SkBitmap left_bitmap_;
   SkBitmap right_bitmap_;
   SkBitmap center_bitmap_;
   bool loaded_;
 
   DISALLOW_COPY_AND_ASSIGN(HandleResources);
 };
 
 base::LazyInstance<HandleResources>::Leaky g_selection_resources;
 
 }  // namespace
 
 CompositedTouchHandleDrawable::CompositedTouchHandleDrawable(
     cc::Layer* root_layer,
     float dpi_scale,
     jobject context)
     : dpi_scale_(dpi_scale),
-      orientation_(TOUCH_HANDLE_ORIENTATION_UNDEFINED),
+      orientation_(ui::TOUCH_HANDLE_ORIENTATION_UNDEFINED),
       layer_(cc::UIResourceLayer::Create()) {
   g_selection_resources.Get().LoadIfNecessary(context);
   DCHECK(root_layer);
   root_layer->AddChild(layer_.get());
 }
 
 CompositedTouchHandleDrawable::~CompositedTouchHandleDrawable() {
   Detach();
 }
 
 void CompositedTouchHandleDrawable::SetEnabled(bool enabled) {
   layer_->SetIsDrawable(enabled);
 }
 
 void CompositedTouchHandleDrawable::SetOrientation(
-    TouchHandleOrientation orientation) {
+    ui::TouchHandleOrientation orientation) {
   DCHECK(layer_->parent());
   orientation_ = orientation;
 
   const SkBitmap& bitmap = g_selection_resources.Get().GetBitmap(orientation);
   layer_->SetBitmap(bitmap);
   layer_->SetBounds(gfx::Size(bitmap.width(), bitmap.height()));
 
   switch (orientation_) {
-    case TOUCH_HANDLE_LEFT:
+    case ui::TOUCH_HANDLE_LEFT:
       focal_offset_from_origin_ = gfx::Vector2dF(bitmap.width() * 0.75f, 0);
       break;
-    case TOUCH_HANDLE_RIGHT:
+    case ui::TOUCH_HANDLE_RIGHT:
       focal_offset_from_origin_ = gfx::Vector2dF(bitmap.width() * 0.25f, 0);
       break;
-    case TOUCH_HANDLE_CENTER:
+    case ui::TOUCH_HANDLE_CENTER:
       focal_offset_from_origin_ = gfx::Vector2dF(bitmap.width() * 0.5f, 0);
       break;
-    case TOUCH_HANDLE_ORIENTATION_UNDEFINED:
+    case ui::TOUCH_HANDLE_ORIENTATION_UNDEFINED:
       NOTREACHED() << "Invalid touch handle orientation.";
       break;
   };
 
   layer_->SetPosition(focal_position_ - focal_offset_from_origin_);
 }
 
 void CompositedTouchHandleDrawable::SetAlpha(float alpha) {
   DCHECK(layer_->parent());
   alpha = std::max(0.f, std::min(1.f, alpha));
@@ skipping 23 matching lines @@
                     layer_->bounds().width(),
                     layer_->bounds().height());
 }
 
 // static
 bool CompositedTouchHandleDrawable::RegisterHandleViewResources(JNIEnv* env) {
   return RegisterNativesImpl(env);
 }
 
 }  // namespace content