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

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

Issue 690103008: Implemented swipe to close in overview mode. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 1 month 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/wm/overview/window_selector.cc
diff --git a/ash/wm/overview/window_selector.cc b/ash/wm/overview/window_selector.cc
index 338f9e9c866c5de08d048cfe2180f4a1365c5626..77adb1346f0e055a7324f1f8759af876bf5b3cb1 100644
--- a/ash/wm/overview/window_selector.cc
+++ b/ash/wm/overview/window_selector.cc
@@ -5,6 +5,7 @@
#include "ash/wm/overview/window_selector.h"
#include <algorithm>
+#include <functional>
#include <set>
#include <vector>
@@ -293,18 +294,18 @@ WindowSelector::~WindowSelector() {
shell->activation_client()->RemoveObserver(this);
aura::Window::Windows root_windows = Shell::GetAllRootWindows();
+ OverviewAnimationSettingsProvider* animation_settings_provider =
+ ash::Shell::GetInstance()
+ ->window_selector_controller()
+ ->GetAnimationSettingsProvider();
+
const aura::WindowTracker::Windows hidden_windows(hidden_windows_.windows());
for (aura::WindowTracker::Windows::const_iterator iter =
hidden_windows.begin(); iter != hidden_windows.end(); ++iter) {
- OverviewAnimationSettingsProvider* animation_settings_provider =
- ash::Shell::GetInstance()
- ->window_selector_controller()
- ->GetAnimationSettingsProvider();
- scoped_ptr<ui::ScopedLayerAnimationSettings> animation_settings =
+ scoped_ptr<ui::ScopedLayerAnimationSettings> settings =
animation_settings_provider->Create(
- ash::OverviewAnimationSettingsProvider::AnimationType::
- LAYOUT_SELECTOR_ITEMS,
- *iter);
+ OverviewAnimationSettingsProvider::AnimationType::RESTORE_WINDOW,
+ (*iter));
(*iter)->layer()->SetOpacity(1);
(*iter)->Show();
}
@@ -546,21 +547,22 @@ void WindowSelector::HideAndTrackNonOverviewWindows() {
}
}
+ OverviewAnimationSettingsProvider* animation_settings_provider =
+ ash::Shell::GetInstance()
+ ->window_selector_controller()
+ ->GetAnimationSettingsProvider();
+
// Copy the window list as it can change during iteration.
const aura::WindowTracker::Windows hidden_windows(hidden_windows_.windows());
for (aura::WindowTracker::Windows::const_iterator iter =
hidden_windows.begin(); iter != hidden_windows.end(); ++iter) {
if (!hidden_windows_.Contains(*iter))
continue;
- OverviewAnimationSettingsProvider* animation_settings_provider =
- ash::Shell::GetInstance()
- ->window_selector_controller()
- ->GetAnimationSettingsProvider();
- scoped_ptr<ui::ScopedLayerAnimationSettings> animation_settings =
+
+ scoped_ptr<ui::ScopedLayerAnimationSettings> settings =
animation_settings_provider->Create(
- ash::OverviewAnimationSettingsProvider::AnimationType::
- HIDE_WINDOW,
- *iter);
+ OverviewAnimationSettingsProvider::AnimationType::HIDE_WINDOW,
+ (*iter));
(*iter)->Hide();
// Hiding the window can result in it being destroyed.
if (!hidden_windows_.Contains(*iter))

Powered by Google App Engine
This is Rietveld 408576698