Views: Replace resource ids with ui::TextEditCommand enum for text editing commands in Textfield.

chrome/browser/ui/views/omnibox/omnibox_view_views.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 "chrome/browser/ui/views/omnibox/omnibox_view_views.h"
 
 #include <set>
 
 #include "base/command_line.h"
 #include "base/logging.h"
@@ skipping 24 matching lines @@
 #include "content/public/browser/web_contents.h"
 #include "extensions/common/constants.h"
 #include "grit/components_strings.h"
 #include "net/base/escape.h"
 #include "third_party/skia/include/core/SkColor.h"
 #include "ui/accessibility/ax_view_state.h"
 #include "ui/base/clipboard/scoped_clipboard_writer.h"
 #include "ui/base/dragdrop/drag_drop_types.h"
 #include "ui/base/dragdrop/os_exchange_data.h"
 #include "ui/base/ime/input_method.h"
+#include "ui/base/ime/text_edit_commands.h"
 #include "ui/base/ime/text_input_client.h"
 #include "ui/base/ime/text_input_type.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/material_design/material_design_controller.h"
 #include "ui/base/models/simple_menu_model.h"
 #include "ui/compositor/layer.h"
 #include "ui/events/event.h"
 #include "ui/gfx/canvas.h"
 #include "ui/gfx/font_list.h"
 #include "ui/gfx/selection_model.h"
@@ skipping 303 matching lines @@
     // These commands don't invoke the popup via OnBefore/AfterPossibleChange().
     case IDS_PASTE_AND_GO:
       model()->PasteAndGo(GetClipboardText());
       return;
     case IDS_SHOW_URL:
       controller()->ShowURL();
       return;
     case IDC_EDIT_SEARCH_ENGINES:
       location_bar_view_->command_updater()->ExecuteCommand(command_id);
       return;
-    case IDS_MOVE_DOWN:
-    case IDS_MOVE_UP:
-      model()->OnUpOrDownKeyPressed(command_id == IDS_MOVE_DOWN ? 1 : -1);
-      return;
 
     // These commands do invoke the popup.
     case IDS_APP_PASTE:
-      OnPaste();
+      ExecuteTextEditCommand(ui::TextEditCommand::PASTE);
       return;
     default:
       if (Textfield::IsCommandIdEnabled(command_id)) {
         // The Textfield code will invoke OnBefore/AfterPossibleChange() itself
         // as necessary.
         Textfield::ExecuteCommand(command_id, event_flags);
         return;
       }
       OnBeforePossibleChange();
       location_bar_view_->command_updater()->ExecuteCommand(command_id);
@@ skipping 354 matching lines @@
     case ui::VKEY_ESCAPE:
       return model()->OnEscapeKeyPressed();
     case ui::VKEY_CONTROL:
       model()->OnControlKeyChanged(true);
       break;
     case ui::VKEY_DELETE:
       if (shift && model()->popup_model()->IsOpen())
         model()->popup_model()->TryDeletingCurrentItem();
       break;
     case ui::VKEY_UP:
-      if (!read_only()) {
-        model()->OnUpOrDownKeyPressed(-1);
+      if (IsTextEditCommandEnabled(ui::TextEditCommand::MOVE_UP)) {
+        ExecuteTextEditCommand(ui::TextEditCommand::MOVE_UP);
         return true;
       }
       break;
     case ui::VKEY_DOWN:
-      if (!read_only()) {
-        model()->OnUpOrDownKeyPressed(1);
+      if (IsTextEditCommandEnabled(ui::TextEditCommand::MOVE_DOWN)) {
+        ExecuteTextEditCommand(ui::TextEditCommand::MOVE_DOWN);
         return true;
       }
       break;
     case ui::VKEY_PRIOR:
       if (control || alt || shift)
         return false;
       model()->OnUpOrDownKeyPressed(-1 * model()->result().size());
       return true;
     case ui::VKEY_NEXT:
       if (control || alt || shift)
         return false;
       model()->OnUpOrDownKeyPressed(model()->result().size());
       return true;
     case ui::VKEY_V:
-      if (control && !alt && !read_only()) {
-        ExecuteCommand(IDS_APP_PASTE, 0);
+      if (control && !alt &&
+          IsTextEditCommandEnabled(ui::TextEditCommand::PASTE)) {
+        ExecuteTextEditCommand(ui::TextEditCommand::PASTE);
         return true;
       }
       break;
     case ui::VKEY_INSERT:
-      if (shift && !control && !read_only()) {
-        ExecuteCommand(IDS_APP_PASTE, 0);
+      if (shift && !control &&
+          IsTextEditCommandEnabled(ui::TextEditCommand::PASTE)) {
+        ExecuteTextEditCommand(ui::TextEditCommand::PASTE);
         return true;
       }
       break;
     default:
       break;
   }
 
   return views::Textfield::OnKeyPressed(event) || HandleEarlyTabActions(event);
 }
 
@@ skipping 100 matching lines @@
     location_bar_view_->SchedulePaint();
 }
 
 bool OmniboxViewViews::IsCommandIdEnabled(int command_id) const {
   if (command_id == IDS_APP_PASTE)
     return !read_only() && !GetClipboardText().empty();
   if (command_id == IDS_PASTE_AND_GO)
     return !read_only() && model()->CanPasteAndGo(GetClipboardText());
   if (command_id == IDS_SHOW_URL)
     return controller()->GetToolbarModel()->WouldReplaceURL();
-  return command_id == IDS_MOVE_DOWN || command_id == IDS_MOVE_UP ||
-         Textfield::IsCommandIdEnabled(command_id) ||
+  return Textfield::IsCommandIdEnabled(command_id) ||
          location_bar_view_->command_updater()->IsCommandEnabled(command_id);
 }
 
 base::string16 OmniboxViewViews::GetSelectionClipboardText() const {
   return SanitizeTextForPaste(Textfield::GetSelectionClipboardText());
 }
 
 void OmniboxViewViews::DoInsertChar(base::char16 ch) {
   // If |insert_char_time_| is not null, there's a pending insert char operation
   // that hasn't been painted yet. Keep the earlier time.
   if (insert_char_time_.is_null())
     insert_char_time_ = base::TimeTicks::Now();
   Textfield::DoInsertChar(ch);
 }
 
+bool OmniboxViewViews::IsTextEditCommandEnabled(
+    ui::TextEditCommand command) const {
+  switch (command) {
+    case ui::TextEditCommand::MOVE_UP:
+    case ui::TextEditCommand::MOVE_DOWN:
+      return !read_only();
+    case ui::TextEditCommand::PASTE:
+      return !read_only() && !GetClipboardText().empty();
+    default:
+      return Textfield::IsTextEditCommandEnabled(command);
+  }
+}
+
+void OmniboxViewViews::ExecuteTextEditCommand(ui::TextEditCommand command) {
+  // In the base class, touch text selection is deactivated when a command is
+  // executed. Since we are not always calling the base class implementation
+  // here, we need to deactivate touch text selection here, too.
+  DestroyTouchSelection();
+
+  if (!IsTextEditCommandEnabled(command))
+    return;
+
+  switch (command) {
+    case ui::TextEditCommand::MOVE_UP:
+      model()->OnUpOrDownKeyPressed(-1);
+      break;
+    case ui::TextEditCommand::MOVE_DOWN:
+      model()->OnUpOrDownKeyPressed(1);
+      break;
+    case ui::TextEditCommand::PASTE:
+      OnPaste();
+      break;
+    default:
+      Textfield::ExecuteTextEditCommand(command);
+      break;
+  }
+}
+
 #if defined(OS_CHROMEOS)
 void OmniboxViewViews::CandidateWindowOpened(
       chromeos::input_method::InputMethodManager* manager) {
   ime_candidate_window_open_ = true;
 }
 
 void OmniboxViewViews::CandidateWindowClosed(
       chromeos::input_method::InputMethodManager* manager) {
   ime_candidate_window_open_ = false;
 }
@@ skipping 145 matching lines @@
     menu_contents->InsertItemWithStringIdAt(
         select_all_position + 1, IDS_SHOW_URL, IDS_SHOW_URL);
   }
 
   // Minor note: We use IDC_ for command id here while the underlying textfield
   // is using IDS_ for all its command ids. This is because views cannot depend
   // on IDC_ for now.
   menu_contents->AddItemWithStringId(IDC_EDIT_SEARCH_ENGINES,
       IDS_EDIT_SEARCH_ENGINES);
 }