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 113 matching lines @@
   // Assume CJK + Thai users are using an IME.
   if (language == "ja" ||
       language == "ko" ||
       language == "th" ||
       language == "zh")
     return ui::TEXT_INPUT_TYPE_SEARCH;
 #endif
   return ui::TEXT_INPUT_TYPE_URL;
 }
 
+ui::TextEditCommand GetCommandForKeyEvent(const ui::KeyEvent& event) {
+  const bool shift = event.IsShiftDown();
+  const bool control = event.IsControlDown();
+  const bool alt = event.IsAltDown() || event.IsAltGrDown();
+  switch (event.key_code()) {
+    case ui::VKEY_UP:
+      return ui::TextEditCommand::MOVE_UP;
+    case ui::VKEY_DOWN:
+      return ui::TextEditCommand::MOVE_DOWN;
+    case ui::VKEY_PRIOR:
+      if (!(control || alt || shift))
+        return ui::TextEditCommand::MOVE_PAGE_UP;
+      break;
+    case ui::VKEY_NEXT:
+      if (!(control || alt || shift))
+        return ui::TextEditCommand::MOVE_PAGE_DOWN;
+      break;
+    case ui::VKEY_V:
+      if (control && !alt)
+        return ui::TextEditCommand::PASTE;
+      break;
+    case ui::VKEY_INSERT:
+      if (shift && !control)
+        return ui::TextEditCommand::PASTE;
+      break;
+    default:
+      break;
+  }
+  return ui::TextEditCommand::INVALID_COMMAND;
+}
+
 }  // namespace
 
 
 // OmniboxViewViews -----------------------------------------------------------
 
 // static
 const char OmniboxViewViews::kViewClassName[] = "OmniboxViewViews";
 
 OmniboxViewViews::OmniboxViewViews(OmniboxEditController* controller,
                                    Profile* profile,
@@ skipping 216 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();
+      ExecuteEditCommand(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);
       OnAfterPossibleChange(true);
       return;
   }
 }
 
+void OmniboxViewViews::ExecuteEditCommand(ui::TextEditCommand command) {
+  if (!IsEditCommandEnabled(command))
+    return;
+
+  DestroyTouchSelection();
+  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;
+    case ui::TextEditCommand::MOVE_PAGE_UP:
+      model()->OnUpOrDownKeyPressed(-1 * model()->result().size());
+      break;
+    case ui::TextEditCommand::MOVE_PAGE_DOWN:
+      model()->OnUpOrDownKeyPressed(model()->result().size());
+      break;
+    default:
+      Textfield::ExecuteEditCommand(command);
+      break;
+  }
+}
+
 void OmniboxViewViews::SetTextAndSelectedRange(const base::string16& text,
                                                const gfx::Range& range) {
   SetText(text);
   SelectRange(range);
 }
 
 base::string16 OmniboxViewViews::GetSelectedText() const {
   // TODO(oshima): Support IME.
   return views::Textfield::GetSelectedText();
 }
@@ skipping 35 matching lines @@
 }
 
 void OmniboxViewViews::AccessibilitySetValue(const base::string16& new_value) {
   SetUserText(new_value, true);
 }
 
 void OmniboxViewViews::UpdateSecurityLevel() {
   security_level_ = controller()->GetToolbarModel()->GetSecurityLevel(false);
 }
 
+bool OmniboxViewViews::IsEditCommandEnabledInternal(
+    ui::TextEditCommand command) const {
+  switch (command) {
+    case ui::TextEditCommand::MOVE_UP:
+    case ui::TextEditCommand::MOVE_DOWN:
+    case ui::TextEditCommand::PASTE:
+      return !read_only();
+    // Todo shouldn't this also have read_only?
+    case ui::TextEditCommand::MOVE_PAGE_UP:
+    case ui::TextEditCommand::MOVE_PAGE_DOWN:
+      return true;
+    default:
+      break;
+  }
+  return false;
+}
+
 void OmniboxViewViews::SetWindowTextAndCaretPos(const base::string16& text,
                                                 size_t caret_pos,
                                                 bool update_popup,
                                                 bool notify_text_changed) {
   const gfx::Range range(caret_pos, caret_pos);
   SetTextAndSelectedRange(text, range);
 
   if (update_popup)
     UpdatePopup();
 
@@ skipping 278 matching lines @@
   select_all_on_mouse_release_ = false;
 }
 
 bool OmniboxViewViews::OnKeyPressed(const ui::KeyEvent& event) {
   // Skip processing of [Alt]+<num-pad digit> Unicode alt key codes.
   // Otherwise, if num-lock is off, the events are handled as [Up], [Down], etc.
   if (event.IsUnicodeKeyCode())
     return views::Textfield::OnKeyPressed(event);
 
   const bool shift = event.IsShiftDown();
-  const bool control = event.IsControlDown();
   const bool alt = event.IsAltDown() || event.IsAltGrDown();
   switch (event.key_code()) {
     case ui::VKEY_RETURN:
       model()->AcceptInput(alt ? NEW_FOREGROUND_TAB : CURRENT_TAB, false);
       return true;
     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);
-        return true;
-      }
-      break;
-    case ui::VKEY_DOWN:
-      if (!read_only()) {
-        model()->OnUpOrDownKeyPressed(1);
-        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);
-        return true;
-      }
-      break;
-    case ui::VKEY_INSERT:
-      if (shift && !control && !read_only()) {
-        ExecuteCommand(IDS_APP_PASTE, 0);
-        return true;
-      }
-      break;
     default:
       break;
   }
 
+  ui::TextEditCommand command = scheduled_edit_command();
+  if (command == ui::TextEditCommand::INVALID_COMMAND)
+    command = GetCommandForKeyEvent(event);
+
+  if (IsEditCommandEnabledInternal(command)) {
+    reset_scheduled_edit_command();
+    ExecuteEditCommand(command);
+    return true;
+  }
+
   return views::Textfield::OnKeyPressed(event) || HandleEarlyTabActions(event);
 }
 
 void OmniboxViewViews::OnGestureEvent(ui::GestureEvent* event) {
   if (!HasFocus() && event->type() == ui::ET_GESTURE_TAP_DOWN) {
     select_all_on_gesture_tap_ = true;
 
     // If we're trying to select all on tap, invalidate any saved selection lest
     // restoring it fights with the "select all" action.
     saved_selection_for_focus_change_ = gfx::Range::InvalidRange();
@@ skipping 93 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) ||
+  // What about IDC_EDIT_SEARCH_ENGINES?

[tapted, 2016/05/31 04:18:16]

What's the context for this? I think this is deprecated anyway - see
http://crbug.com/542487 http://crrev.com/392688 . Maybe there's more code to
tear out.

[karandeepb, 2016/05/31 05:12:32]

Edit Search Engines still remains as a context menu action on the omnibox, but
doesn't appear in IsCommandIDEnabled
(https://code.google.com/p/chromium/codesearch#chromium/src/chrome/browser/ui/...).

+  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::IsEditCommandEnabled(ui::TextEditCommand command) const {
+  return IsEditCommandEnabledInternal(command) ||
+         Textfield::IsEditCommandEnabled(command);
+}
+
 #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);
 }