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

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

Issue 2750483005: Moves app_list() and related functions from Shell to WmShell (Closed)
Patch Set: dont explicitly delete 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
« no previous file with comments | « ash/common/accelerators/accelerator_controller.cc ('k') | ash/common/mojo_interface_factory.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/common/accelerators/accelerator_router.cc
diff --git a/ash/common/accelerators/accelerator_router.cc b/ash/common/accelerators/accelerator_router.cc
index 2a42383b1303c82731b130494c55bb375f6076ca..c11c5f23c9a0f5accecc0e7cfe7903e8e60bdd65 100644
--- a/ash/common/accelerators/accelerator_router.cc
+++ b/ash/common/accelerators/accelerator_router.cc
@@ -8,6 +8,7 @@
#include "ash/common/wm/window_state.h"
#include "ash/common/wm_shell.h"
#include "ash/common/wm_window.h"
+#include "ash/shell.h"
#include "base/metrics/histogram_macros.h"
#include "base/stl_util.h"
#include "ui/base/accelerators/accelerator.h"
@@ -128,7 +129,7 @@ bool AcceleratorRouter::ShouldProcessAcceleratorNow(
if (accelerator_controller->IsPreferred(accelerator))
return true;
- return WmShell::Get()->GetAppListTargetVisibility();
+ return Shell::Get()->GetAppListTargetVisibility();
}
} // namespace ash
« no previous file with comments | « ash/common/accelerators/accelerator_controller.cc ('k') | ash/common/mojo_interface_factory.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698