| 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..a6e409af170fa398f24569872ae17a935d7e5d13 100644
|
| --- a/ash/wm/overview/window_selector_controller.cc
|
| +++ b/ash/wm/overview/window_selector_controller.cc
|
| @@ -24,6 +24,7 @@ WindowSelectorController::WindowSelectorController() {
|
| }
|
|
|
| WindowSelectorController::~WindowSelectorController() {
|
| + DCHECK(!IsSelecting());
|
| }
|
|
|
| // static
|
| @@ -52,7 +53,8 @@ void WindowSelectorController::ToggleOverview() {
|
| if (windows.empty())
|
| return;
|
|
|
| - window_selector_.reset(new WindowSelector(windows, this));
|
| + window_selector_.reset(new WindowSelector(this));
|
| + window_selector_->Init(windows);
|
| OnSelectionStarted();
|
| }
|
| }
|
| @@ -61,9 +63,15 @@ 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();
|
| }
|
|
|