Modify ui::TextInputClient to use ui::TextEditCommand enum in place of resource ids.

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 307 matching lines @@
       return;
     case IDS_SHOW_URL:
       controller()->ShowURL();
       return;
     case IDC_EDIT_SEARCH_ENGINES:
       location_bar_view_->command_updater()->ExecuteCommand(command_id);
       return;
 
     // These commands do invoke the popup.
     case IDS_APP_PASTE:
-      ExecuteEditCommand(IDS_APP_PASTE);
+      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 364 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 (IsEditCommandEnabled(IDS_MOVE_UP)) {
-        ExecuteEditCommand(IDS_MOVE_UP);
+      if (IsTextEditCommandEnabled(ui::TextEditCommand::MOVE_UP)) {
+        ExecuteTextEditCommand(ui::TextEditCommand::MOVE_UP);
         return true;
       }
       break;
     case ui::VKEY_DOWN:
-      if (IsEditCommandEnabled(IDS_MOVE_DOWN)) {
-        ExecuteEditCommand(IDS_MOVE_DOWN);
+      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 && IsEditCommandEnabled(IDS_APP_PASTE)) {
-        ExecuteEditCommand(IDS_APP_PASTE);
+      if (control && !alt &&
+          IsTextEditCommandEnabled(ui::TextEditCommand::PASTE)) {
+        ExecuteTextEditCommand(ui::TextEditCommand::PASTE);
         return true;
       }
       break;
     case ui::VKEY_INSERT:
-      if (shift && !control && IsEditCommandEnabled(IDS_APP_PASTE)) {
-        ExecuteEditCommand(IDS_APP_PASTE);
+      if (shift && !control &&
+          IsTextEditCommandEnabled(ui::TextEditCommand::PASTE)) {
+        ExecuteTextEditCommand(ui::TextEditCommand::PASTE);
         return true;
       }
       break;
     default:
       break;
   }
 
   return views::Textfield::OnKeyPressed(event) || HandleEarlyTabActions(event);
 }
 
@@ skipping 116 matching lines @@
 }
 
 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::IsEditCommandEnabled(int command_id) const {
-  switch (command_id) {
-    case IDS_MOVE_UP:
-    case IDS_MOVE_DOWN:
+bool OmniboxViewViews::IsTextEditCommandEnabled(
+    ui::TextEditCommand command) const {
+  switch (command) {
+    case ui::TextEditCommand::MOVE_UP:
+    case ui::TextEditCommand::MOVE_DOWN:
       return !read_only();
-    case IDS_APP_PASTE:
+    case ui::TextEditCommand::PASTE:
       return !read_only() && !GetClipboardText().empty();
     default:
-      return Textfield::IsEditCommandEnabled(command_id);
+      return Textfield::IsTextEditCommandEnabled(command);
   }
 }
 
-void OmniboxViewViews::ExecuteEditCommand(int command_id) {
+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 (!IsEditCommandEnabled(command_id))
+  if (!IsTextEditCommandEnabled(command))
     return;
 
-  switch (command_id) {
-    case IDS_MOVE_UP:
+  switch (command) {
+    case ui::TextEditCommand::MOVE_UP:
       model()->OnUpOrDownKeyPressed(-1);
       break;
-    case IDS_MOVE_DOWN:
+    case ui::TextEditCommand::MOVE_DOWN:
       model()->OnUpOrDownKeyPressed(1);
       break;
-    case IDS_APP_PASTE:
+    case ui::TextEditCommand::PASTE:
       OnPaste();
       break;
     default:
-      Textfield::ExecuteEditCommand(command_id);
+      Textfield::ExecuteTextEditCommand(command);
       break;
   }
 }
 
 #if defined(OS_CHROMEOS)
 void OmniboxViewViews::CandidateWindowOpened(
       chromeos::input_method::InputMethodManager* manager) {
   ime_candidate_window_open_ = true;
 }
 
@@ skipping 149 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);
 }