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

Unified Diff: ash/accelerators/focus_manager_factory.cc

Issue 2170753005: Moves AcceleratorController from Shell to WmShell (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: include 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
« no previous file with comments | « ash/accelerators/accelerator_delegate.cc ('k') | ash/common/wm_shell.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/accelerators/focus_manager_factory.cc
diff --git a/ash/accelerators/focus_manager_factory.cc b/ash/accelerators/focus_manager_factory.cc
index d7166d7b6047e22475db0d181c60eac81803d4bb..96fb3d49eb9ed9506a920a09226767e156816776 100644
--- a/ash/accelerators/focus_manager_factory.cc
+++ b/ash/accelerators/focus_manager_factory.cc
@@ -5,7 +5,7 @@
#include "ash/accelerators/focus_manager_factory.h"
#include "ash/common/accelerators/accelerator_controller.h"
-#include "ash/shell.h"
+#include "ash/common/wm_shell.h"
#include "ui/views/focus/focus_manager.h"
namespace ash {
@@ -21,8 +21,7 @@ views::FocusManager* AshFocusManagerFactory::CreateFocusManager(
bool AshFocusManagerFactory::Delegate::ProcessAccelerator(
const ui::Accelerator& accelerator) {
- AcceleratorController* controller =
- Shell::GetInstance()->accelerator_controller();
+ AcceleratorController* controller = WmShell::Get()->accelerator_controller();
if (controller)
return controller->Process(accelerator);
return false;
« no previous file with comments | « ash/accelerators/accelerator_delegate.cc ('k') | ash/common/wm_shell.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698