Views::Textfield: Decouple handling of menu and text editing commands.

ui/views/view_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 "ui/views/view.h"
 
 #include <stddef.h>
 
 #include <map>
 #include <memory>
@@ skipping 2011 matching lines @@
 
   normal->SetText(kNormalText);
   read_only->SetText(kReadOnlyText);
   password->SetText(kPasswordText);
 
   //
   // Test cut.
   //
 
   normal->SelectAll(false);
-  normal->ExecuteCommand(IDS_APP_CUT);
+  normal->ExecuteCommand(IDS_APP_CUT, 0);
   base::string16 result;
   clipboard->ReadText(ui::CLIPBOARD_TYPE_COPY_PASTE, &result);
   EXPECT_EQ(kNormalText, result);
   normal->SetText(kNormalText);  // Let's revert to the original content.
 
   read_only->SelectAll(false);
-  read_only->ExecuteCommand(IDS_APP_CUT);
+  read_only->ExecuteCommand(IDS_APP_CUT, 0);
   result.clear();
   clipboard->ReadText(ui::CLIPBOARD_TYPE_COPY_PASTE, &result);
   // Cut should have failed, so the clipboard content should not have changed.
   EXPECT_EQ(kNormalText, result);
 
   password->SelectAll(false);
-  password->ExecuteCommand(IDS_APP_CUT);
+  password->ExecuteCommand(IDS_APP_CUT, 0);
   result.clear();
   clipboard->ReadText(ui::CLIPBOARD_TYPE_COPY_PASTE, &result);
   // Cut should have failed, so the clipboard content should not have changed.
   EXPECT_EQ(kNormalText, result);
 
   //
   // Test copy.
   //
 
   // Start with |read_only| to observe a change in clipboard text.
   read_only->SelectAll(false);
-  read_only->ExecuteCommand(IDS_APP_COPY);
+  read_only->ExecuteCommand(IDS_APP_COPY, 0);
   result.clear();
   clipboard->ReadText(ui::CLIPBOARD_TYPE_COPY_PASTE, &result);
   EXPECT_EQ(kReadOnlyText, result);
 
   normal->SelectAll(false);
-  normal->ExecuteCommand(IDS_APP_COPY);
+  normal->ExecuteCommand(IDS_APP_COPY, 0);
   result.clear();
   clipboard->ReadText(ui::CLIPBOARD_TYPE_COPY_PASTE, &result);
   EXPECT_EQ(kNormalText, result);
 
   password->SelectAll(false);
-  password->ExecuteCommand(IDS_APP_COPY);
+  password->ExecuteCommand(IDS_APP_COPY, 0);
   result.clear();
   clipboard->ReadText(ui::CLIPBOARD_TYPE_COPY_PASTE, &result);
   // Text cannot be copied from an obscured field; the clipboard won't change.
   EXPECT_EQ(kNormalText, result);
 
   //
   // Test paste.
   //
 
   // Attempting to paste kNormalText in a read-only text-field should fail.
   read_only->SelectAll(false);
-  read_only->ExecuteCommand(IDS_APP_PASTE);
+  read_only->ExecuteCommand(IDS_APP_PASTE, 0);
   EXPECT_EQ(kReadOnlyText, read_only->text());
 
   password->SelectAll(false);
-  password->ExecuteCommand(IDS_APP_PASTE);
+  password->ExecuteCommand(IDS_APP_PASTE, 0);
   EXPECT_EQ(kNormalText, password->text());
 
   // Copy from |read_only| to observe a change in the normal textfield text.
   read_only->SelectAll(false);
-  read_only->ExecuteCommand(IDS_APP_COPY);
+  read_only->ExecuteCommand(IDS_APP_COPY, 0);
   normal->SelectAll(false);
-  normal->ExecuteCommand(IDS_APP_PASTE);
+  normal->ExecuteCommand(IDS_APP_PASTE, 0);
   EXPECT_EQ(kReadOnlyText, normal->text());
   widget->CloseNow();
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // Accelerators
 ////////////////////////////////////////////////////////////////////////////////
 bool TestView::AcceleratorPressed(const ui::Accelerator& accelerator) {
   accelerator_count_map_[accelerator]++;
   return true;
@@ skipping 2464 matching lines @@
   widget.Init(params);
 
   AddViewWithChildLayer(widget.GetRootView());
   ViewThatAddsViewInOnNativeThemeChanged* v =
       new ViewThatAddsViewInOnNativeThemeChanged;
   widget.GetRootView()->AddChildView(v);
   EXPECT_TRUE(v->on_native_theme_changed_called());
 }
 
 }  // namespace views