ash/wm/workspace_controller.cc - Issue 23531053: ui/base/animation -> ui/gfx/animation

Side by Side Diff

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Side by Side Diff: ash/wm/workspace_controller.cc

Issue 23531053: ui/base/animation -> ui/gfx/animation (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Merge 2 trunk Created 7 years, 3 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 unified diff | Download patch | Annotate | Revision Log

« no previous file with comments | « ash/wm/workspace/workspace_window_resizer_unittest.cc ('k') | cc/output/filter_operation.cc » ('j') | no next file with comments »

OLD	NEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.	1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.

2 // Use of this source code is governed by a BSD-style license that can be	2 // Use of this source code is governed by a BSD-style license that can be

3 // found in the LICENSE file.	3 // found in the LICENSE file.

4	4

5 #include "ash/wm/workspace_controller.h"	5 #include "ash/wm/workspace_controller.h"

6	6

7 #include "ash/shelf/shelf_layout_manager.h"	7 #include "ash/shelf/shelf_layout_manager.h"

8 #include "ash/shell.h"	8 #include "ash/shell.h"

9 #include "ash/shell_window_ids.h"	9 #include "ash/shell_window_ids.h"

10 #include "ash/wm/base_layout_manager.h"	10 #include "ash/wm/base_layout_manager.h"

(...skipping 98 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
109	109

110 settings.SetPreemptionStrategy(ui::LayerAnimator::ENQUEUE_NEW_ANIMATION);	110 settings.SetPreemptionStrategy(ui::LayerAnimator::ENQUEUE_NEW_ANIMATION);

111 viewport_->layer()->GetAnimator()->SchedulePauseForProperties(	111 viewport_->layer()->GetAnimator()->SchedulePauseForProperties(

112 base::TimeDelta::FromMilliseconds(kInitialPauseTimeMS),	112 base::TimeDelta::FromMilliseconds(kInitialPauseTimeMS),

113 ui::LayerAnimationElement::TRANSFORM,	113 ui::LayerAnimationElement::TRANSFORM,

114 ui::LayerAnimationElement::OPACITY,	114 ui::LayerAnimationElement::OPACITY,

115 ui::LayerAnimationElement::BRIGHTNESS,	115 ui::LayerAnimationElement::BRIGHTNESS,

116 ui::LayerAnimationElement::VISIBILITY,	116 ui::LayerAnimationElement::VISIBILITY,

117 -1);	117 -1);

118	118

119 settings.SetTweenType(ui::Tween::EASE_OUT);	119 settings.SetTweenType(gfx::Tween::EASE_OUT);

120 settings.SetTransitionDuration(	120 settings.SetTransitionDuration(

121 base::TimeDelta::FromMilliseconds(kCrossFadeDurationMS));	121 base::TimeDelta::FromMilliseconds(kCrossFadeDurationMS));

122 viewport_->layer()->SetTransform(gfx::Transform());	122 viewport_->layer()->SetTransform(gfx::Transform());

123 viewport_->layer()->SetOpacity(1.0f);	123 viewport_->layer()->SetOpacity(1.0f);

124 }	124 }

125 }	125 }

126	126

127 } // namespace internal	127 } // namespace internal

128 } // namespace ash	128 } // namespace ash

OLD	NEW