Deprecating high-conflict accelerators

ui/views/focus/focus_manager.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 "ui/views/focus/focus_manager.h"
 
 #include <algorithm>
 #include <vector>
 
 #include "base/auto_reset.h"
@@ skipping 471 matching lines @@
 }
 
 bool FocusManager::ProcessAccelerator(const ui::Accelerator& accelerator) {
   if (accelerator_manager_->Process(accelerator))
     return true;
   if (delegate_.get())
     return delegate_->ProcessAccelerator(accelerator);
   return false;
 }
 
+bool FocusManager::IsAcceleratorDeprecated(
+    const ui::Accelerator& accelerator) const {
+  return delegate_.get() &&
+      delegate_.get()->IsAcceleratorDeprecated(accelerator);
+}
+
 ui::AcceleratorTarget* FocusManager::GetCurrentTargetForAccelerator(
     const ui::Accelerator& accelerator) const {
   ui::AcceleratorTarget* target =
       accelerator_manager_->GetCurrentTarget(accelerator);
   if (!target && delegate_.get())
     target = delegate_->GetCurrentTargetForAccelerator(accelerator);
   return target;
 }
 
 bool FocusManager::HasPriorityHandler(
@@ skipping 34 matching lines @@
   }
   if (key_code == ui::VKEY_RIGHT || key_code == ui::VKEY_DOWN) {
     AdvanceFocus(false);
     return true;
   }
 
   return false;
 }
 
 }  // namespace views