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

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

Issue 10365007: ui: Move compositor/ directory out of gfx/, up to ui/. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: fix DEPS Created 8 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 unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « ash/wm/window_animations.cc ('k') | ash/wm/window_resizer.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 "ui/aura/test/test_windows.h" 9 #include "ui/aura/test/test_windows.h"
10 #include "ui/aura/window.h" 10 #include "ui/aura/window.h"
11 #include "ui/base/animation/animation_container_element.h" 11 #include "ui/base/animation/animation_container_element.h"
12 #include "ui/gfx/compositor/layer_animator.h" 12 #include "ui/compositor/layer.h"
13 #include "ui/gfx/compositor/layer.h" 13 #include "ui/compositor/layer_animator.h"
14 14
15 namespace ash { 15 namespace ash {
16 namespace internal { 16 namespace internal {
17 17
18 typedef ash::test::AshTestBase WindowAnimationsWorkspaceTest; 18 typedef ash::test::AshTestBase WindowAnimationsWorkspaceTest;
19 19
20 TEST_F(WindowAnimationsWorkspaceTest, HideShow) { 20 TEST_F(WindowAnimationsWorkspaceTest, HideShow) {
21 aura::Window* default_container = 21 aura::Window* default_container =
22 ash::Shell::GetInstance()->GetContainer( 22 ash::Shell::GetInstance()->GetContainer(
23 internal::kShellWindowId_DefaultContainer); 23 internal::kShellWindowId_DefaultContainer);
(...skipping 56 matching lines...) Expand 10 before | Expand all | Expand 10 after
80 static_cast<ui::AnimationContainerElement*>( 80 static_cast<ui::AnimationContainerElement*>(
81 window->layer()->GetAnimator()); 81 window->layer()->GetAnimator());
82 element->Step(base::TimeTicks::Now() + 82 element->Step(base::TimeTicks::Now() +
83 base::TimeDelta::FromSeconds(5)); 83 base::TimeDelta::FromSeconds(5));
84 EXPECT_EQ(0.0f, window->layer()->GetTargetOpacity()); 84 EXPECT_EQ(0.0f, window->layer()->GetTargetOpacity());
85 EXPECT_FALSE(window->layer()->visible()); 85 EXPECT_FALSE(window->layer()->visible());
86 } 86 }
87 87
88 } // namespace internal 88 } // namespace internal
89 } // namespace ash 89 } // namespace ash
OLDNEW
« no previous file with comments | « ash/wm/window_animations.cc ('k') | ash/wm/window_resizer.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698