Change touch selection handles to images given by UX.

ui/views/touchui/touch_selection_controller_impl_unittest.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 "base/command_line.h"
 #include "base/strings/utf_string_conversions.h"
+#include "grit/ui_resources.h"
+#include "ui/base/resource/resource_bundle.h"
 #include "ui/base/touch/touch_editing_controller.h"
 #include "ui/base/ui_base_switches.h"
 #include "ui/gfx/point.h"
 #include "ui/gfx/rect.h"
 #include "ui/gfx/render_text.h"
 #include "ui/views/controls/textfield/native_textfield_views.h"
 #include "ui/views/controls/textfield/textfield.h"
 #include "ui/views/test/views_test_base.h"
 #include "ui/views/touchui/touch_selection_controller_impl.h"
 #include "ui/views/widget/widget.h"
 
 #if defined(USE_AURA)
 #include "ui/aura/test/event_generator.h"
 #include "ui/aura/window.h"
 #endif
 
+namespace {
+// Should match kSelectionHandlePadding in touch_selection_controller.
+const int kPadding = 10;
+
+gfx::Image* GetHandleImage() {
+  static gfx::Image* handle_image = NULL;
+  if (!handle_image) {
+    handle_image = &ui::ResourceBundle::GetSharedInstance().GetImageNamed(
+        IDR_TEXT_SELECTION_HANDLE);
+  }
+  return handle_image;
+}
+
+gfx::Size GetHandleImageSize() {
+  return GetHandleImage()->Size();
+}
+}  // namespace
+
 namespace views {
 
 class TouchSelectionControllerImplTest : public ViewsTestBase {
  public:
   TouchSelectionControllerImplTest()
       : widget_(NULL),
         textfield_(NULL),
         textfield_view_(NULL),
         views_tsc_factory_(new ViewsTouchSelectionControllerFactory) {
     CommandLine::ForCurrentProcess()->AppendSwitch(
@@ skipping 47 matching lines @@
   void SimulateSelectionHandleDrag(gfx::Point p, int selection_handle) {
     TouchSelectionControllerImpl* controller = GetSelectionController();
     // Do the work of OnMousePressed().
     if (selection_handle == 1)
       controller->SetDraggingHandle(controller->selection_handle_1_.get());
     else
       controller->SetDraggingHandle(controller->selection_handle_2_.get());
 
     // Offset the drag position by the selection handle radius since it is
     // supposed to be in the coordinate system of the handle.
-    p.Offset(10, 0);
+    p.Offset(GetHandleImageSize().width() / 2 + kPadding, 0);
     controller->SelectionHandleDragged(p);
 
     // Do the work of OnMouseReleased().
     controller->dragging_handle_ = NULL;
   }
 
   gfx::Point GetSelectionHandle1Position() {
     return GetSelectionController()->GetSelectionHandle1Position();
   }
 
@@ skipping 41 matching lines @@
     if (textfield_->HasSelection()) {                                          \
       EXPECT_TRUE(IsSelectionHandle1Visible());                                \
       EXPECT_TRUE(IsSelectionHandle2Visible());                                \
       EXPECT_FALSE(IsCursorHandleVisible());                                   \
       gfx::SelectionModel sel_start = GetRenderText()->                        \
                                       GetSelectionModelForSelectionStart();    \
       gfx::Point selection_start = GetCursorPosition(sel_start);               \
       gfx::Point selection_end = GetCursorPosition(sel);                       \
       gfx::Point sh1 = GetSelectionHandle1Position();                          \
       gfx::Point sh2 = GetSelectionHandle2Position();                          \
-      sh1.Offset(10, 0);                                                       \
-      sh2.Offset(10, 0);                                                       \
+      sh1.Offset(GetHandleImageSize().width() / 2 + kPadding, 0);              \
+      sh2.Offset(GetHandleImageSize().width() / 2 + kPadding, 0);              \
       if (cursor_at_selection_handle_1) {                                      \
         EXPECT_EQ(sh1, selection_end);                                         \
         EXPECT_EQ(sh2, selection_start);                                       \
       } else {                                                                 \
         EXPECT_EQ(sh1, selection_start);                                       \
         EXPECT_EQ(sh2, selection_end);                                         \
       }                                                                        \
     } else {                                                                   \
       EXPECT_FALSE(IsSelectionHandle1Visible());                               \
       EXPECT_FALSE(IsSelectionHandle2Visible());                               \
       EXPECT_TRUE(IsCursorHandleVisible());                                    \
       gfx::Point cursor_pos = GetCursorPosition(sel);                          \
       gfx::Point ch_pos = GetCursorHandlePosition();                           \
-      ch_pos.Offset(10, 0);                                                    \
+      ch_pos.Offset(GetHandleImageSize().width() / 2 + kPadding, 0);           \
       EXPECT_EQ(ch_pos, cursor_pos);                                           \
     }                                                                          \
 }
 
 // Tests that the selection handles are placed appropriately when selection in
 // a Textfield changes.
 TEST_F(TouchSelectionControllerImplTest, SelectionInTextfieldTest) {
   CreateTextfield();
   textfield_->SetText(ASCIIToUTF16("some text"));
   // Tap the textfield to invoke touch selection.
@@ skipping 244 matching lines @@
   generator.GestureTapAt(gfx::Point(10, 10));
 
   // Cursor handle should be visible.
   EXPECT_FALSE(textfield_->HasSelection());
   VERIFY_HANDLE_POSITIONS(false);
 
   // Double tap on the cursor handle position. We want to check that the cursor
   // handle is not eating the event and that the event is falling through to the
   // textfield.
   gfx::Point cursor_pos = GetCursorHandlePosition();
+  cursor_pos.Offset(GetHandleImageSize().width() / 2 + kPadding, 0);
   generator.GestureTapAt(cursor_pos);
   generator.GestureTapAt(cursor_pos);
   EXPECT_TRUE(textfield_->HasSelection());
   VERIFY_HANDLE_POSITIONS(false);
 }
 #endif
 
 }  // namespace views