MacViewsBrowser: Fix omnibox crash due to failed DCHECK.

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 624 matching lines @@
     SkColor security_color =
         location_bar_view_->GetSecureTextColor(security_level_);
     const bool strike =
         (security_level_ == security_state::SecurityStateModel::SECURITY_ERROR);
     const gfx::Range scheme_range(scheme.begin, scheme.end());
     ApplyColor(security_color, scheme_range);
     ApplyStyle(gfx::DIAGONAL_STRIKE, strike, scheme_range);
   }
 }
 
-bool OmniboxViewViews::OnKeyReleased(const ui::KeyEvent& event) {
-  // The omnibox contents may change while the control key is pressed.
-  if (event.key_code() == ui::VKEY_CONTROL)
-    model()->OnControlKeyChanged(false);
-  return views::Textfield::OnKeyReleased(event);
-}
-
 bool OmniboxViewViews::IsItemForCommandIdDynamic(int command_id) const {
   return command_id == IDS_PASTE_AND_GO;
 }
 
 base::string16 OmniboxViewViews::GetLabelForCommandId(int command_id) const {
   DCHECK_EQ(IDS_PASTE_AND_GO, command_id);
   return l10n_util::GetStringUTF16(
       model()->IsPasteAndSearch(GetClipboardText()) ?
           IDS_PASTE_AND_SEARCH : IDS_PASTE_AND_GO);
 }
@@ skipping 42 matching lines @@
     if (select_all_on_mouse_release_ &&
         !controller()->GetToolbarModel()->WouldReplaceURL()) {
       // Select all in the reverse direction so as not to scroll the caret
       // into view and shift the contents jarringly.
       SelectAll(true);
     }
   }
   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 (IsTextEditCommandEnabled(ui::TextEditCommand::MOVE_UP)) {
-        ExecuteTextEditCommand(ui::TextEditCommand::MOVE_UP);
-        return true;
-      }
-      break;
-    case ui::VKEY_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 &&
-          IsTextEditCommandEnabled(ui::TextEditCommand::PASTE)) {
-        ExecuteTextEditCommand(ui::TextEditCommand::PASTE);
-        return true;
-      }
-      break;
-    case ui::VKEY_INSERT:
-      if (shift && !control &&
-          IsTextEditCommandEnabled(ui::TextEditCommand::PASTE)) {
-        ExecuteTextEditCommand(ui::TextEditCommand::PASTE);
-        return true;
-      }
-      break;
-    default:
-      break;
-  }
-
-  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();
   }
 
   views::Textfield::OnGestureEvent(event);
@@ skipping 162 matching lines @@
   ime_candidate_window_open_ = false;
 }
 #endif
 
 void OmniboxViewViews::ContentsChanged(views::Textfield* sender,
                                        const base::string16& new_contents) {
 }
 
 bool OmniboxViewViews::HandleKeyEvent(views::Textfield* textfield,
                                       const ui::KeyEvent& event) {
-  if (event.type() != ui::ET_KEY_PRESSED)
+  if (event.type() == ui::ET_KEY_RELEASED) {
+    // The omnibox contents may change while the control key is pressed.
+    if (event.key_code() == ui::VKEY_CONTROL)
+      model()->OnControlKeyChanged(false);
+
     return false;
+  }
 
   delete_at_end_pressed_ = false;
 
-  if (event.key_code() == ui::VKEY_BACK) {
-    // No extra handling is needed in keyword search mode, if there is a
-    // non-empty selection, or if the cursor is not leading the text.
-    if (model()->is_keyword_hint() || model()->keyword().empty() ||
-        HasSelection() || GetCursorPosition() != 0)
-      return false;
-    model()->ClearKeyword();
-    return true;
+  // 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 false;
+
+  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();
+
+      delete_at_end_pressed_ = (!event.IsAltDown() && !HasSelection() &&
+                                GetCursorPosition() == text().length());
+      break;
+    case ui::VKEY_UP:
+      if (IsTextEditCommandEnabled(ui::TextEditCommand::MOVE_UP)) {
+        ExecuteTextEditCommand(ui::TextEditCommand::MOVE_UP);
+        return true;
+      }
+      break;
+    case ui::VKEY_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 &&
+          IsTextEditCommandEnabled(ui::TextEditCommand::PASTE)) {
+        ExecuteTextEditCommand(ui::TextEditCommand::PASTE);
+        return true;
+      }
+      break;
+    case ui::VKEY_INSERT:
+      if (shift && !control &&
+          IsTextEditCommandEnabled(ui::TextEditCommand::PASTE)) {
+        ExecuteTextEditCommand(ui::TextEditCommand::PASTE);
+        return true;
+      }
+      break;
+    case ui::VKEY_BACK:
+      // No extra handling is needed in keyword search mode, if there is a
+      // non-empty selection, or if the cursor is not leading the text.
+      if (model()->is_keyword_hint() || model()->keyword().empty() ||
+          HasSelection() || GetCursorPosition() != 0)
+        return false;
+      model()->ClearKeyword();
+      return true;
+
+    // Handle the right-arrow key for LTR text and the left-arrow key for RTL
+    // text if there is gray text that needs to be committed.
+    case ui::VKEY_RIGHT:
+      if (GetCursorPosition() == text().length() &&
+          GetTextDirection() == base::i18n::LEFT_TO_RIGHT) {
+        return model()->CommitSuggestedText();
+      }
+      break;
+    case ui::VKEY_LEFT:
+      if (GetCursorPosition() == text().length() &&
+          GetTextDirection() == base::i18n::RIGHT_TO_LEFT) {
+        return model()->CommitSuggestedText();
+      }
+      break;
+
+    default:
+      break;
   }
 
-  if (event.key_code() == ui::VKEY_DELETE && !event.IsAltDown()) {
-    delete_at_end_pressed_ =
-        (!HasSelection() && GetCursorPosition() == text().length());
-  }
-
-  // Handle the right-arrow key for LTR text and the left-arrow key for RTL text
-  // if there is gray text that needs to be committed.
-  if (GetCursorPosition() == text().length()) {
-    base::i18n::TextDirection direction = GetTextDirection();
-    if ((direction == base::i18n::LEFT_TO_RIGHT &&
-         event.key_code() == ui::VKEY_RIGHT) ||
-        (direction == base::i18n::RIGHT_TO_LEFT &&
-         event.key_code() == ui::VKEY_LEFT)) {
-      return model()->CommitSuggestedText();
-    }
-  }
-
-  return false;
+  return HandleEarlyTabActions(event);
 }
 
 void OmniboxViewViews::OnBeforeUserAction(views::Textfield* sender) {
   OnBeforePossibleChange();
 }
 
 void OmniboxViewViews::OnAfterUserAction(views::Textfield* sender) {
   OnAfterPossibleChange(true);
 }
 
@@ skipping 89 matching lines @@
       paste_position + 1, IDS_PASTE_AND_GO, IDS_PASTE_AND_GO);
 
   menu_contents->AddSeparator(ui::NORMAL_SEPARATOR);
 
   // 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);
 }