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

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

Issue 844763006: Change overview mode to so that docked panel windows are not grouped together. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fixed stale pointer in ScopedTransformOverviewWindow. Created 5 years, 11 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/overview/window_selector_controller.h ('k') | ash/wm/overview/window_selector_item.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/wm/overview/window_selector_controller.cc
diff --git a/ash/wm/overview/window_selector_controller.cc b/ash/wm/overview/window_selector_controller.cc
index 6fbe0daef1fc9aeb5e1ca5d4d68f012137b2d658..df14d27e87c57fb4b8b912d3c195b48d7583c553 100644
--- a/ash/wm/overview/window_selector_controller.cc
+++ b/ash/wm/overview/window_selector_controller.cc
@@ -52,7 +52,9 @@ void WindowSelectorController::ToggleOverview() {
if (windows.empty())
return;
- window_selector_.reset(new WindowSelector(windows, this));
+ Shell::GetInstance()->OnOverviewModeStarting();
+ window_selector_.reset(new WindowSelector(this));
+ window_selector_->Init(windows);
OnSelectionStarted();
}
}
@@ -61,11 +63,18 @@ bool WindowSelectorController::IsSelecting() {
return window_selector_.get() != NULL;
}
+bool WindowSelectorController::IsRestoringMinimizedWindows() const {
+ return window_selector_.get() != NULL &&
+ window_selector_->restoring_minimized_windows();
+}
+
// TODO(flackr): Make WindowSelectorController observe the activation of
// windows, so we can remove WindowSelectorDelegate.
void WindowSelectorController::OnSelectionEnded() {
+ window_selector_->Shutdown();
window_selector_.reset();
last_selection_time_ = base::Time::Now();
+ Shell::GetInstance()->OnOverviewModeEnded();
}
void WindowSelectorController::OnSelectionStarted() {
« no previous file with comments | « ash/wm/overview/window_selector_controller.h ('k') | ash/wm/overview/window_selector_item.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698