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

Unified Diff: ash/common/accelerators/ash_focus_manager_factory.cc

Issue 2752593008: Move AcceleratorController from WmShell to Shell (Closed)
Patch Set: cleanup Created 3 years, 9 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
Index: ash/common/accelerators/ash_focus_manager_factory.cc
diff --git a/ash/common/accelerators/ash_focus_manager_factory.cc b/ash/common/accelerators/ash_focus_manager_factory.cc
index 058e05756e542f40105be7105a7e4667f40a0110..1cf7644c3c4d9dc6da437406204e94601507c2de 100644
--- a/ash/common/accelerators/ash_focus_manager_factory.cc
+++ b/ash/common/accelerators/ash_focus_manager_factory.cc
@@ -5,7 +5,7 @@
#include "ash/common/accelerators/ash_focus_manager_factory.h"
#include "ash/common/accelerators/accelerator_controller.h"
-#include "ash/common/wm_shell.h"
+#include "ash/shell.h"
#include "base/memory/ptr_util.h"
#include "ui/views/focus/focus_manager.h"
@@ -24,7 +24,7 @@ views::FocusManager* AshFocusManagerFactory::CreateFocusManager(
bool AshFocusManagerFactory::Delegate::ProcessAccelerator(
const ui::Accelerator& accelerator) {
- AcceleratorController* controller = WmShell::Get()->accelerator_controller();
+ AcceleratorController* controller = Shell::Get()->accelerator_controller();
if (controller)
return controller->Process(accelerator);
return false;

Powered by Google App Engine
This is Rietveld 408576698