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

Unified Diff: ash/wm/session_state_animator.cc

Issue 11230050: ash : introduce second SessionStateController implementation. (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: Merge with TOT, review fixes Created 8 years, 2 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
« no previous file with comments | « ash/wm/session_state_animator.h ('k') | ash/wm/session_state_controller.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/wm/session_state_animator.cc
diff --git a/ash/wm/session_state_animator.cc b/ash/wm/session_state_animator.cc
index 180a034d5c18bcb4a02185a297e34e4a142562ba..92006619860356903ec00612dc41cecdf17af4bd 100644
--- a/ash/wm/session_state_animator.cc
+++ b/ash/wm/session_state_animator.cc
@@ -140,15 +140,15 @@ bool SessionStateAnimator::TestApi::ContainersAreAnimated(
ui::Layer* layer = window->layer();
switch (type) {
- case ANIMATION_SLOW_CLOSE:
+ case ANIMATION_PARTIAL_CLOSE:
if (layer->GetTargetTransform() != GetSlowCloseTransform())
return false;
break;
- case ANIMATION_UNDO_SLOW_CLOSE:
+ case ANIMATION_UNDO_PARTIAL_CLOSE:
if (layer->GetTargetTransform() != gfx::Transform())
return false;
break;
- case ANIMATION_FAST_CLOSE:
+ case ANIMATION_FULL_CLOSE:
if (layer->GetTargetTransform() != GetFastCloseTransform() ||
layer->GetTargetOpacity() > 0.0001)
return false;
@@ -261,13 +261,13 @@ void SessionStateAnimator::StartAnimation(int container_mask,
it != containers.end(); ++it) {
aura::Window* window = *it;
switch (type) {
- case ANIMATION_SLOW_CLOSE:
+ case ANIMATION_PARTIAL_CLOSE:
StartSlowCloseAnimationForWindow(window);
break;
- case ANIMATION_UNDO_SLOW_CLOSE:
+ case ANIMATION_UNDO_PARTIAL_CLOSE:
StartUndoSlowCloseAnimationForWindow(window);
break;
- case ANIMATION_FAST_CLOSE:
+ case ANIMATION_FULL_CLOSE:
StartFastCloseAnimationForWindow(window);
break;
case ANIMATION_FADE_IN:
« no previous file with comments | « ash/wm/session_state_animator.h ('k') | ash/wm/session_state_controller.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698