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

Unified Diff: ash/wm/overview/scoped_overview_animation_settings.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.cc
diff --git a/ash/wm/overview/scoped_overview_animation_settings.cc b/ash/wm/overview/scoped_overview_animation_settings.cc
deleted file mode 100644
index e0cf9776e9cbe09039d7aafdd716cc5d22ce2735..0000000000000000000000000000000000000000
--- a/ash/wm/overview/scoped_overview_animation_settings.cc
+++ /dev/null
@@ -1,76 +0,0 @@
-// Copyright 2014 The Chromium Authors. All rights reserved.
-// 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/overview_animation_type.h"
-#include "base/time/time.h"
-#include "ui/aura/window.h"
-#include "ui/compositor/layer.h"
-#include "ui/gfx/animation/tween.h"
-
-namespace ash {
-
-namespace {
-
-// The time duration for transformation animations.
-const int kTransitionMilliseconds = 200;
-
-// The time duration for widgets to fade in.
-const int kFadeInMilliseconds = 80;
-
-base::TimeDelta GetAnimationDuration(OverviewAnimationType animation_type) {
- switch (animation_type) {
- case OVERVIEW_ANIMATION_NONE:
- return base::TimeDelta();
- case OVERVIEW_ANIMATION_ENTER_OVERVIEW_MODE_FADE_IN:
- return base::TimeDelta::FromMilliseconds(kFadeInMilliseconds);
- case OVERVIEW_ANIMATION_LAY_OUT_SELECTOR_ITEMS:
- case OVERVIEW_ANIMATION_RESTORE_WINDOW:
- case OVERVIEW_ANIMATION_HIDE_WINDOW:
- return base::TimeDelta::FromMilliseconds(kTransitionMilliseconds);
- }
- NOTREACHED();
- return base::TimeDelta();
-}
-
-} // namespace
-
-ScopedOverviewAnimationSettings::ScopedOverviewAnimationSettings(
- OverviewAnimationType animation_type,
- aura::Window* window)
- : animation_settings_(window->layer()->GetAnimator()) {
-
- switch (animation_type) {
- case OVERVIEW_ANIMATION_NONE:
- animation_settings_.SetPreemptionStrategy(
- ui::LayerAnimator::REPLACE_QUEUED_ANIMATIONS);
- break;
- case OVERVIEW_ANIMATION_ENTER_OVERVIEW_MODE_FADE_IN:
- window->layer()->GetAnimator()->SchedulePauseForProperties(
- GetAnimationDuration(
- OverviewAnimationType::OVERVIEW_ANIMATION_LAY_OUT_SELECTOR_ITEMS),
- ui::LayerAnimationElement::OPACITY);
- animation_settings_.SetPreemptionStrategy(
- ui::LayerAnimator::REPLACE_QUEUED_ANIMATIONS);
- break;
- case OVERVIEW_ANIMATION_LAY_OUT_SELECTOR_ITEMS:
- case OVERVIEW_ANIMATION_RESTORE_WINDOW:
- animation_settings_.SetPreemptionStrategy(
- ui::LayerAnimator::IMMEDIATELY_ANIMATE_TO_NEW_TARGET);
- animation_settings_.SetTweenType(gfx::Tween::FAST_OUT_SLOW_IN);
- break;
- case OVERVIEW_ANIMATION_HIDE_WINDOW:
- animation_settings_.SetPreemptionStrategy(
- ui::LayerAnimator::IMMEDIATELY_ANIMATE_TO_NEW_TARGET);
- break;
- }
- animation_settings_.SetTransitionDuration(
- GetAnimationDuration(animation_type));
-}
-
-ScopedOverviewAnimationSettings::~ScopedOverviewAnimationSettings() {
-}
-
-} // namespace ash
« no previous file with comments | « ash/wm/overview/scoped_overview_animation_settings.h ('k') | ash/wm/overview/scoped_overview_animation_settings_aura.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698