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

Unified Diff: ash/wm/window_animations.cc

Issue 2237613002: mash: Migrate some misc ShelfLayoutManager deps to ash common. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Move ShelfBezelEventHandler to WmShelfAura. Created 4 years, 4 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/wm/window_animations.cc
diff --git a/ash/wm/window_animations.cc b/ash/wm/window_animations.cc
index 77024956054399758947f800a641cae8fdf10309..b26f2283b71506eb8619a42c83ebfa77aecf82d0 100644
--- a/ash/wm/window_animations.cc
+++ b/ash/wm/window_animations.cc
@@ -78,12 +78,12 @@ base::TimeDelta GetCrossFadeDuration(aura::Window* window,
int max_area = std::max(old_area, new_area);
// Avoid divide by zero.
if (max_area == 0)
- return base::TimeDelta::FromMilliseconds(kCrossFadeDurationMS);
+ return base::TimeDelta::FromMilliseconds(wm::kCrossFadeDurationMS);
int delta_area = std::abs(old_area - new_area);
// If the area didn't change, the animation is instantaneous.
if (delta_area == 0)
- return base::TimeDelta::FromMilliseconds(kCrossFadeDurationMS);
+ return base::TimeDelta::FromMilliseconds(wm::kCrossFadeDurationMS);
float factor = static_cast<float>(delta_area) / static_cast<float>(max_area);
const float kRange = kCrossFadeDurationMaxMs - kCrossFadeDurationMinMs;
@@ -93,8 +93,6 @@ base::TimeDelta GetCrossFadeDuration(aura::Window* window,
} // namespace
-const int kCrossFadeDurationMS = 200;
-
void AddLayerAnimationsForMinimize(aura::Window* window, bool show) {
// Recalculate the transform at restore time since the launcher item may have
// moved while the window was minimized.

Powered by Google App Engine
This is Rietveld 408576698