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

Unified Diff: ash/common/wm/overview/window_selector_controller.cc

Issue 2739763003: Moves maintaining ShellObservers back to Shell (Closed)
Patch Set: merge 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/wm/overview/window_selector_controller.cc
diff --git a/ash/common/wm/overview/window_selector_controller.cc b/ash/common/wm/overview/window_selector_controller.cc
index 2c8b4efa2cf05370fa66a9ea48442e2d6f419fd5..7dd994d2e4b00c4cbb63d1b746117ada8c698809 100644
--- a/ash/common/wm/overview/window_selector_controller.cc
+++ b/ash/common/wm/overview/window_selector_controller.cc
@@ -13,6 +13,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"
namespace ash {
@@ -63,7 +64,7 @@ bool WindowSelectorController::ToggleOverview() {
if (windows.empty())
return false;
- WmShell::Get()->OnOverviewModeStarting();
+ Shell::GetInstance()->NotifyOverviewModeStarting();
window_selector_.reset(new WindowSelector(this));
window_selector_->Init(windows);
OnSelectionStarted();
@@ -96,7 +97,7 @@ void WindowSelectorController::OnSelectionEnded() {
window_selector_->Shutdown();
window_selector_.reset();
last_selection_time_ = base::Time::Now();
- WmShell::Get()->OnOverviewModeEnded();
+ Shell::GetInstance()->NotifyOverviewModeEnded();
}
void WindowSelectorController::AddDelayedAnimationObserver(
« no previous file with comments | « ash/common/wm/maximize_mode/maximize_mode_window_manager.cc ('k') | ash/common/wm/panels/panel_frame_view.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698