Landing Hamaji accelerator clean-up patch

chrome/browser/views/location_bar_view.cc

 // Copyright (c) 2006-2008 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/views/location_bar_view.h"
 
 #include "base/path_service.h"
 #include "base/string_util.h"
 #include "chrome/app/chrome_dll_resource.h"
 #include "chrome/browser/alternate_nav_url_fetcher.h"
@@ skipping 770 matching lines @@
   if (show_labels) {
     pref = leading_label_.GetPreferredSize();
     leading_label_.SetBounds(x, 0, pref.width(), height());
 
     x += pref.width() + kTabButtonBitmap->width();
     pref = trailing_label_.GetPreferredSize();
     trailing_label_.SetBounds(x, 0, pref.width(), height());
   }
 }
 
-// We don't translate accelerators for ALT + numpad digit, they are used for
-// entering special characters.
 bool LocationBarView::ShouldLookupAccelerators(const views::KeyEvent& e) {
-  if (!e.IsAltDown())
+  int c = e.GetCharacter();
+  // We don't translate accelerators for ALT + numpad digit, they are used for
+  // entering special characters.
+  if (e.IsAltDown() && win_util::IsNumPadDigit(c, e.IsExtendedKey()))
+    return false;
+
+  // Skip accelerators for key combinations omnibox wants to crack. This list
+  // should be synced with AutocompleteEditViewWin::OnKeyDownOnlyWritable().
+  //
+  // We cannot return false for all keys because we still need to handle some
+  // accelerators (e.g., F5 for reload the page should work even when the
+  // Omnibox gets focused).
+  switch (c) {
+  case VK_RETURN:
+    return false;
+
+  case VK_UP:
+  case VK_DOWN:
+    return e.IsAltDown();
+
+  case VK_DELETE:
+  case VK_INSERT:
+    return e.IsAltDown() || !e.IsShiftDown();
+
+  case 'X':
+  case 'V':
+    return e.IsAltDown() || !e.IsControlDown();
+
+  case VK_BACK:
+  case VK_TAB:
+  case 0xbb:
+    return false;
+
+  default:
     return true;
-
-  return !win_util::IsNumPadDigit(e.GetCharacter(), e.IsExtendedKey());
+  }
 }
 
 // ShowInfoBubbleTask-----------------------------------------------------------
 
 class LocationBarView::ShowInfoBubbleTask : public Task {
  public:
   explicit ShowInfoBubbleTask(
       LocationBarView::LocationBarImageView* image_view);
   virtual void Run();
   void Cancel();
@@ skipping 281 matching lines @@
 }
 
 void LocationBarView::FocusSearch() {
   location_entry_->SetUserText(L"?");
   location_entry_->SetFocus();
 }
 
 void LocationBarView::SaveStateToContents(TabContents* contents) {
   location_entry_->SaveStateToTab(contents);
 }