Reland: Move TouchSelectionController from content to ui

content/browser/renderer_host/render_widget_host_view_aura.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_aura.h"
 
 #include "base/auto_reset.h"
 #include "base/basictypes.h"
 #include "base/bind.h"
 #include "base/callback_helpers.h"
@@ skipping 911 matching lines @@
 #endif  // defined(USE_X11) && !defined(OS_CHROMEOS)
 }
 
 gfx::Size RenderWidgetHostViewAura::GetRequestedRendererSize() const {
   return delegated_frame_host_->GetRequestedRendererSize();
 }
 
 void RenderWidgetHostViewAura::SelectionBoundsChanged(
     const ViewHostMsg_SelectionBounds_Params& params) {
   ui::SelectionBound anchor_bound, focus_bound;
-  anchor_bound.edge_top = params.anchor_rect.origin();
-  anchor_bound.edge_bottom = params.anchor_rect.bottom_left();
-  focus_bound.edge_top = params.focus_rect.origin();
-  focus_bound.edge_bottom = params.focus_rect.bottom_left();
+  anchor_bound.SetEdge(params.anchor_rect.origin(),
+                       params.anchor_rect.bottom_left());
+  focus_bound.SetEdge(params.focus_rect.origin(),
+                      params.focus_rect.bottom_left());
 
   if (params.anchor_rect == params.focus_rect) {
-    anchor_bound.type = focus_bound.type = ui::SelectionBound::CENTER;
+    anchor_bound.set_type(ui::SelectionBound::CENTER);
+    focus_bound.set_type(ui::SelectionBound::CENTER);
   } else {
     // Whether text is LTR at the anchor handle.
     bool anchor_LTR = params.anchor_dir == blink::WebTextDirectionLeftToRight;
     // Whether text is LTR at the focus handle.
     bool focus_LTR = params.focus_dir == blink::WebTextDirectionLeftToRight;
 
     if ((params.is_anchor_first && anchor_LTR) ||
         (!params.is_anchor_first && !anchor_LTR)) {
-      anchor_bound.type = ui::SelectionBound::LEFT;
+      anchor_bound.set_type(ui::SelectionBound::LEFT);
     } else {
-      anchor_bound.type = ui::SelectionBound::RIGHT;
+      anchor_bound.set_type(ui::SelectionBound::RIGHT);
     }
     if ((params.is_anchor_first && focus_LTR) ||
         (!params.is_anchor_first && !focus_LTR)) {
-      focus_bound.type = ui::SelectionBound::RIGHT;
+      focus_bound.set_type(ui::SelectionBound::RIGHT);
     } else {
-      focus_bound.type = ui::SelectionBound::LEFT;
+      focus_bound.set_type(ui::SelectionBound::LEFT);
     }
   }
 
   if (anchor_bound == selection_anchor_ && focus_bound == selection_focus_)
     return;
 
   selection_anchor_ = anchor_bound;
   selection_focus_ = focus_bound;
   if (GetInputMethod())
     GetInputMethod()->OnCaretBoundsChanged(this);
@@ skipping 1607 matching lines @@
 
 ////////////////////////////////////////////////////////////////////////////////
 // RenderWidgetHostViewBase, public:
 
 // static
 void RenderWidgetHostViewBase::GetDefaultScreenInfo(WebScreenInfo* results) {
   GetScreenInfoForWindow(results, NULL);
 }
 
 }  // namespace content