Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(55)

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: chrome/browser/ui/ash/ash_util.cc

Issue 2170753005: Moves AcceleratorController from Shell to WmShell (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: no-find-copies Created 4 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« ash/shell.cc ('K') | « chrome/browser/ui/ash/ash_init.cc ('k') | chrome/browser/ui/views/chrome_views_delegate.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/ui/ash/ash_util.cc
diff --git a/chrome/browser/ui/ash/ash_util.cc b/chrome/browser/ui/ash/ash_util.cc
index 6539132d14c0f8787a3701bb22f564791badaf86..eeb288aaa6e3f108b90b8e972ab87234d7665a92 100644
--- a/chrome/browser/ui/ash/ash_util.cc
+++ b/chrome/browser/ui/ash/ash_util.cc
@@ -5,7 +5,7 @@
#include "chrome/browser/ui/ash/ash_util.h"
#include "ash/common/accelerators/accelerator_controller.h"
-#include "ash/shell.h"
+#include "ash/common/wm_shell.h"
#include "build/build_config.h"
#include "chrome/browser/ui/ash/ash_init.h"
#include "ui/aura/window_event_dispatcher.h"
@@ -33,9 +33,8 @@ bool IsAcceleratorDeprecated(const ui::Accelerator& accelerator) {
if (chrome::IsRunningInMash())
return false;
- ash::AcceleratorController* controller =
- ash::Shell::GetInstance()->accelerator_controller();
- return controller->IsDeprecated(accelerator);
+ return ash::WmShell::Get()->accelerator_controller()->IsDeprecated(
+ accelerator);
}
} // namespace chrome
« ash/shell.cc ('K') | « chrome/browser/ui/ash/ash_init.cc ('k') | chrome/browser/ui/views/chrome_views_delegate.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698