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

Unified Diff: ash/wm/window_cycle_controller.cc

Issue 2115663002: Folds methods in WmShellCommon to WmShell (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: merge 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/wm/screen_pinning_controller.cc ('k') | ash/wm/window_cycle_list.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/wm/window_cycle_controller.cc
diff --git a/ash/wm/window_cycle_controller.cc b/ash/wm/window_cycle_controller.cc
index c497235e076a3d7be8341268d2b5530e28115a6c..24d05f1a93cfba89ff079c5460d973f5a5549177 100644
--- a/ash/wm/window_cycle_controller.cc
+++ b/ash/wm/window_cycle_controller.cc
@@ -86,7 +86,7 @@ void WindowCycleController::HandleCycleWindow(Direction direction) {
void WindowCycleController::StartCycling() {
MruWindowTracker::WindowList window_list =
- Shell::GetInstance()->mru_window_tracker()->BuildMruWindowList();
+ WmShell::Get()->mru_window_tracker()->BuildMruWindowList();
active_window_before_window_cycle_ = GetActiveWindow(window_list);
@@ -112,7 +112,7 @@ void WindowCycleController::StopCycling() {
window_cycle_list_.reset();
WmWindow* active_window_after_window_cycle = GetActiveWindow(
- Shell::GetInstance()->mru_window_tracker()->BuildMruWindowList());
+ WmShell::Get()->mru_window_tracker()->BuildMruWindowList());
// Remove our key event filter.
event_handler_.reset();
« no previous file with comments | « ash/wm/screen_pinning_controller.cc ('k') | ash/wm/window_cycle_list.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698