Refactor NativeTextfieldViews mouse handlers.

Add support methods for this and coming changes.
Simplify NativeTextfieldViewsTest.DoubleAndTripleClickTest.
Refactor TextfieldViewsModel::MoveCursorTo*.
Detect selection changes in TextfieldViewsModel::MoveCursorTo.

BUG=72040
TEST=--use-pure-views textfield interaction.

Review URL: http://codereview.chromium.org/6893096

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@83991 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 7 insertions, 14 deletions

diff --git a/views/controls/textfield/native_textfield_views_unittest.cc b/views/controls/textfield/native_textfield_views_unittest.cc
index 5c9db0f..4ed3407 100644
--- a/views/controls/textfield/native_textfield_views_unittest.cc
+++ b/views/controls/textfield/native_textfield_views_unittest.cc
@@ -189,10 +189,6 @@ class NativeTextfieldViewsTest : public ViewsTestBase,
     return textfield_view_->context_menu_menu_.get();
   }
 
-  NativeTextfieldViews::ClickState GetClickState() {
-    return textfield_view_->click_state_;
-  }
-
  protected:
   void SendKeyEvent(ui::KeyboardCode key_code,
                     bool shift,
@@ -538,26 +534,23 @@ TEST_F(NativeTextfieldViewsTest, ContextMenuDisplayTest) {
 TEST_F(NativeTextfieldViewsTest, DoubleAndTripleClickTest) {
   InitTextfield(Textfield::STYLE_DEFAULT);
   textfield_->SetText(ASCIIToUTF16("hello world"));
-  MouseEvent me(ui::ET_MOUSE_PRESSED, 0, 0, ui::EF_LEFT_BUTTON_DOWN);
-  EXPECT_EQ(NativeTextfieldViews::NONE, GetClickState());
+  MouseEvent click(ui::ET_MOUSE_PRESSED, 0, 0, ui::EF_LEFT_BUTTON_DOWN);
+  MouseEvent double_click(ui::ET_MOUSE_PRESSED, 0, 0,
+                          ui::EF_LEFT_BUTTON_DOWN | ui::EF_IS_DOUBLE_CLICK);
 
   // Test for double click.
-  textfield_view_->OnMousePressed(me);
+  textfield_view_->OnMousePressed(click);
   EXPECT_STR_EQ("", textfield_->GetSelectedText());
-  EXPECT_EQ(NativeTextfieldViews::TRACKING_DOUBLE_CLICK, GetClickState());
-  textfield_view_->OnMousePressed(me);
+  textfield_view_->OnMousePressed(double_click);
   EXPECT_STR_EQ("hello", textfield_->GetSelectedText());
-  EXPECT_EQ(NativeTextfieldViews::TRACKING_TRIPLE_CLICK, GetClickState());
 
   // Test for triple click.
-  textfield_view_->OnMousePressed(me);
+  textfield_view_->OnMousePressed(click);
   EXPECT_STR_EQ("hello world", textfield_->GetSelectedText());
-  EXPECT_EQ(NativeTextfieldViews::NONE, GetClickState());
 
   // Another click should reset back to single click.
-  textfield_view_->OnMousePressed(me);
+  textfield_view_->OnMousePressed(click);
   EXPECT_STR_EQ("", textfield_->GetSelectedText());
-  EXPECT_EQ(NativeTextfieldViews::TRACKING_DOUBLE_CLICK, GetClickState());
 }
 
 TEST_F(NativeTextfieldViewsTest, ReadOnlyTest) {