Ignore the Search key accelerator on Chrome OS when accessibility is enabled,...

chrome/browser/ui/views/frame/browser_view.cc

Index: chrome/browser/ui/views/frame/browser_view.cc
===================================================================
--- chrome/browser/ui/views/frame/browser_view.cc	(revision 71928)
+++ chrome/browser/ui/views/frame/browser_view.cc	(working copy)
@@ -605,6 +605,17 @@
 }
 
 bool BrowserView::AcceleratorPressed(const views::Accelerator& accelerator) {
+#if defined(OS_CHROMEOS)
+  // If accessibility is enabled, ignore accelerators involving the Search
+  // key so that key combinations involving Search can be used for extra
+  // accessibility functionality.
+  if (accelerator.GetKeyCode() == ui::VKEY_LWIN &&
+      browser_->profile()->GetPrefs()->GetBoolean(
+          prefs::kAccessibilityEnabled)) {
+    return false;
+  }
+#endif
+
   std::map<views::Accelerator, int>::const_iterator iter =
       accelerator_table_.find(accelerator);
   DCHECK(iter != accelerator_table_.end());