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

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

Issue 18050008: Use a direct include of time headers in android_webview/, apps/, ash/. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years, 5 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/window_animations.cc ('k') | ash/wm/workspace/desktop_background_fade_controller.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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/window_animations.h" 5 #include "ash/wm/window_animations.h"
6 6
7 #include "ash/shell_window_ids.h" 7 #include "ash/shell_window_ids.h"
8 #include "ash/test/ash_test_base.h" 8 #include "ash/test/ash_test_base.h"
9 #include "ash/wm/workspace_controller.h" 9 #include "ash/wm/workspace_controller.h"
10 #include "base/time.h" 10 #include "base/time/time.h"
11 #include "ui/aura/test/test_windows.h" 11 #include "ui/aura/test/test_windows.h"
12 #include "ui/aura/window.h" 12 #include "ui/aura/window.h"
13 #include "ui/base/animation/animation_container_element.h" 13 #include "ui/base/animation/animation_container_element.h"
14 #include "ui/compositor/layer.h" 14 #include "ui/compositor/layer.h"
15 #include "ui/compositor/layer_animator.h" 15 #include "ui/compositor/layer_animator.h"
16 #include "ui/compositor/scoped_animation_duration_scale_mode.h" 16 #include "ui/compositor/scoped_animation_duration_scale_mode.h"
17 17
18 using aura::Window; 18 using aura::Window;
19 using ui::Layer; 19 using ui::Layer;
20 20
(...skipping 107 matching lines...) Expand 10 before | Expand all | Expand 10 after
128 EXPECT_EQ(gfx::Transform(), window->layer()->GetTargetTransform()); 128 EXPECT_EQ(gfx::Transform(), window->layer()->GetTargetTransform());
129 129
130 static_cast<ui::AnimationContainerElement*>(old_layer->GetAnimator())->Step( 130 static_cast<ui::AnimationContainerElement*>(old_layer->GetAnimator())->Step(
131 base::TimeTicks::Now() + base::TimeDelta::FromSeconds(1)); 131 base::TimeTicks::Now() + base::TimeDelta::FromSeconds(1));
132 static_cast<ui::AnimationContainerElement*>(window->layer()->GetAnimator())-> 132 static_cast<ui::AnimationContainerElement*>(window->layer()->GetAnimator())->
133 Step(base::TimeTicks::Now() + base::TimeDelta::FromSeconds(1)); 133 Step(base::TimeTicks::Now() + base::TimeDelta::FromSeconds(1));
134 } 134 }
135 135
136 } // namespace internal 136 } // namespace internal
137 } // namespace ash 137 } // namespace ash
OLDNEW
« no previous file with comments | « ash/wm/window_animations.cc ('k') | ash/wm/workspace/desktop_background_fade_controller.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698