| Index: athena/wm/window_overview_mode.cc
|
| diff --git a/athena/wm/window_overview_mode.cc b/athena/wm/window_overview_mode.cc
|
| index 7b3c73e0fc77156a093cf49fe34945a4f3cc8441..2263b13fb3b7186d71caf415d780fc11ec6b15ee 100644
|
| --- a/athena/wm/window_overview_mode.cc
|
| +++ b/athena/wm/window_overview_mode.cc
|
| @@ -180,7 +180,8 @@ class WindowOverviewModeImpl : public WindowOverviewMode,
|
| virtual ~WindowOverviewModeImpl() {
|
| container_->set_target_handler(container_->delegate());
|
| RemoveAnimationObserver();
|
| - aura::Window::Windows windows = window_list_provider_->GetWindowList();
|
| + aura::Window::Windows windows =
|
| + window_list_provider_->GetCurrentWindowList();
|
| if (windows.empty())
|
| return;
|
| std::for_each(windows.begin(), windows.end(),
|
| @@ -193,7 +194,8 @@ class WindowOverviewModeImpl : public WindowOverviewMode,
|
| // positions. The transforms are set in the |kWindowOverviewState| property of
|
| // the windows.
|
| void ComputeTerminalStatesForAllWindows() {
|
| - aura::Window::Windows windows = window_list_provider_->GetWindowList();
|
| + aura::Window::Windows windows =
|
| + window_list_provider_->GetCurrentWindowList();
|
| size_t index = 0;
|
|
|
| for (aura::Window::Windows::const_reverse_iterator iter = windows.rbegin();
|
| @@ -252,7 +254,8 @@ class WindowOverviewModeImpl : public WindowOverviewMode,
|
|
|
| // Sets the initial position for the windows for the overview mode.
|
| void SetInitialWindowStates() {
|
| - aura::Window::Windows windows = window_list_provider_->GetWindowList();
|
| + aura::Window::Windows windows =
|
| + window_list_provider_->GetCurrentWindowList();
|
| // The initial overview state of the topmost three windows.
|
| const float kInitialProgress[] = { 0.5f, 0.05f, 0.01f };
|
| size_t index = 0;
|
| @@ -312,7 +315,8 @@ class WindowOverviewModeImpl : public WindowOverviewMode,
|
| void DoScroll(float delta_y) {
|
| const float kEpsilon = 1e-3f;
|
| float delta_y_p = std::abs(delta_y) / GetScrollableHeight();
|
| - aura::Window::Windows windows = window_list_provider_->GetWindowList();
|
| + aura::Window::Windows windows =
|
| + window_list_provider_->GetCurrentWindowList();
|
| if (delta_y < 0) {
|
| // Scroll up. Start with the top-most (i.e. behind-most in terms of
|
| // z-index) window, and try to scroll them up.
|
| @@ -505,7 +509,8 @@ class WindowOverviewModeImpl : public WindowOverviewMode,
|
| dragged_window_->layer()->SetOpacity(kMinOpacity);
|
| }
|
|
|
| - const aura::Window::Windows list = window_list_provider_->GetWindowList();
|
| + const aura::Window::Windows list =
|
| + window_list_provider_->GetCurrentWindowList();
|
| CHECK(!list.empty());
|
| if (list.front() == dragged_window_) {
|
| // There's no window behind |dragged_window_|. So move the windows in
|
|
|