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

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

Issue 2012343002: Converts overview to use common ash types (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: feedback Created 4 years, 7 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/overview/scoped_overview_animation_settings_aura.cc
diff --git a/ash/wm/overview/scoped_overview_animation_settings.cc b/ash/wm/overview/scoped_overview_animation_settings_aura.cc
similarity index 90%
rename from ash/wm/overview/scoped_overview_animation_settings.cc
rename to ash/wm/overview/scoped_overview_animation_settings_aura.cc
index e0cf9776e9cbe09039d7aafdd716cc5d22ce2735..f3c23da247a1d922f09bbeeb2222579b1f72da25 100644
--- a/ash/wm/overview/scoped_overview_animation_settings.cc
+++ b/ash/wm/overview/scoped_overview_animation_settings_aura.cc
@@ -2,9 +2,8 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "ash/wm/overview/scoped_overview_animation_settings.h"
+#include "ash/wm/overview/scoped_overview_animation_settings_aura.h"
-#include "ash/wm/overview/overview_animation_type.h"
#include "base/time/time.h"
#include "ui/aura/window.h"
#include "ui/compositor/layer.h"
@@ -37,11 +36,10 @@ base::TimeDelta GetAnimationDuration(OverviewAnimationType animation_type) {
} // namespace
-ScopedOverviewAnimationSettings::ScopedOverviewAnimationSettings(
+ScopedOverviewAnimationSettingsAura::ScopedOverviewAnimationSettingsAura(
OverviewAnimationType animation_type,
aura::Window* window)
: animation_settings_(window->layer()->GetAnimator()) {
-
switch (animation_type) {
case OVERVIEW_ANIMATION_NONE:
animation_settings_.SetPreemptionStrategy(
@@ -70,7 +68,6 @@ ScopedOverviewAnimationSettings::ScopedOverviewAnimationSettings(
GetAnimationDuration(animation_type));
}
-ScopedOverviewAnimationSettings::~ScopedOverviewAnimationSettings() {
-}
+ScopedOverviewAnimationSettingsAura::~ScopedOverviewAnimationSettingsAura() {}
} // namespace ash

Powered by Google App Engine
This is Rietveld 408576698