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

Unified Diff: ash/desktop_background/desktop_background_view.cc

Issue 2084503007: Moves WindowSelectorController onto WmShell (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@move_overview
Patch Set: fix mash Created 4 years, 6 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/wm_shell.cc ('k') | ash/mus/bridge/wm_shell_mus.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/desktop_background/desktop_background_view.cc
diff --git a/ash/desktop_background/desktop_background_view.cc b/ash/desktop_background/desktop_background_view.cc
index 72667edbddbb4dec2f0b4eb1fd18208f832f4ba2..8d16ed3c759047adfe72cdfb1486c4f0f1c285fd 100644
--- a/ash/desktop_background/desktop_background_view.cc
+++ b/ash/desktop_background/desktop_background_view.cc
@@ -10,6 +10,7 @@
#include "ash/common/session/session_state_delegate.h"
#include "ash/common/shell_window_ids.h"
#include "ash/common/wm/overview/window_selector_controller.h"
+#include "ash/common/wm_shell.h"
#include "ash/desktop_background/desktop_background_controller.h"
#include "ash/desktop_background/desktop_background_widget_controller.h"
#include "ash/desktop_background/user_wallpaper_delegate.h"
@@ -92,7 +93,7 @@ class PreEventDispatchHandler : public ui::EventHandler {
void OnMouseEvent(ui::MouseEvent* event) override {
CHECK_EQ(ui::EP_PRETARGET, event->phase());
WindowSelectorController* controller =
- Shell::GetInstance()->window_selector_controller();
+ WmShell::Get()->window_selector_controller();
if (event->type() == ui::ET_MOUSE_RELEASED && controller->IsSelecting()) {
controller->ToggleOverview();
event->StopPropagation();
@@ -102,7 +103,7 @@ class PreEventDispatchHandler : public ui::EventHandler {
void OnGestureEvent(ui::GestureEvent* event) override {
CHECK_EQ(ui::EP_PRETARGET, event->phase());
WindowSelectorController* controller =
- Shell::GetInstance()->window_selector_controller();
+ WmShell::Get()->window_selector_controller();
if (event->type() == ui::ET_GESTURE_TAP && controller->IsSelecting()) {
controller->ToggleOverview();
event->StopPropagation();
« no previous file with comments | « ash/common/wm_shell.cc ('k') | ash/mus/bridge/wm_shell_mus.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698