Deprecating high-conflict accelerators

chrome/browser/ui/ash/ash_util.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/ash/ash_util.h"
 
+#include "ash/accelerators/accelerator_controller.h"
 #include "ash/shell.h"
 #include "chrome/browser/ui/ash/ash_init.h"
 #include "chrome/browser/ui/host_desktop.h"
 #include "ui/aura/window_event_dispatcher.h"
 
 #if !defined(OS_CHROMEOS)
 #include "base/command_line.h"
 #include "chrome/common/chrome_switches.h"
 #endif
 
@@ skipping 26 matching lines @@
       return true;
   }
 
   return false;
 }
 
 bool IsNativeWindowInAsh(gfx::NativeWindow native_window) {
   return IsNativeViewInAsh(native_window);
 }
 
+bool IsAcceleratorDeprecated(const ui::Accelerator accelerator) {
+  if (!ash::Shell::HasInstance())
+    return false;

[oshima, 2015/06/19 21:21:45]

this shouldn't be nullptr too.

[afakhry, 2015/06/19 22:14:19]

Done. However there's a similar test for this case above in IsNativeViewInAsh();

+
+  ash::AcceleratorController* controller =

[sky, 2015/06/19 21:00:48]

Do we really allow this to be null?

[afakhry, 2015/06/19 22:14:19]

Done.

+      ash::Shell::GetInstance()->accelerator_controller();
+
+  if (!controller)
+    return false;
+
+  return controller->IsDeprecated(accelerator);
+}
+
 }  // namespace chrome