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

Side by Side Diff: ui/aura/test/aura_test_helper.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 | « ui/aura/root_window_view_mac.h ('k') | ui/aura/test/test_suite.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 "ui/aura/test/aura_test_helper.h" 5 #include "ui/aura/test/aura_test_helper.h"
6 6
7 #include "ui/aura/env.h" 7 #include "ui/aura/env.h"
8 #include "ui/aura/root_window.h" 8 #include "ui/aura/root_window.h"
9 #include "ui/gfx/compositor/layer_animator.h" 9 #include "ui/compositor/layer_animator.h"
10 10
11 namespace aura { 11 namespace aura {
12 namespace test { 12 namespace test {
13 13
14 AuraTestHelper::AuraTestHelper() 14 AuraTestHelper::AuraTestHelper()
15 : setup_called_(false), 15 : setup_called_(false),
16 teardown_called_(false) { 16 teardown_called_(false) {
17 // Disable animations during tests. 17 // Disable animations during tests.
18 ui::LayerAnimator::set_disable_animations_for_test(true); 18 ui::LayerAnimator::set_disable_animations_for_test(true);
19 } 19 }
(...skipping 22 matching lines...) Expand all
42 42
43 void AuraTestHelper::RunAllPendingInMessageLoop(RootWindow* root_window) { 43 void AuraTestHelper::RunAllPendingInMessageLoop(RootWindow* root_window) {
44 #if !defined(OS_MACOSX) 44 #if !defined(OS_MACOSX)
45 message_loop_.RunAllPendingWithDispatcher( 45 message_loop_.RunAllPendingWithDispatcher(
46 Env::GetInstance()->GetDispatcher()); 46 Env::GetInstance()->GetDispatcher());
47 #endif 47 #endif
48 } 48 }
49 49
50 } // namespace test 50 } // namespace test
51 } // namespace aura 51 } // namespace aura
OLDNEW
« no previous file with comments | « ui/aura/root_window_view_mac.h ('k') | ui/aura/test/test_suite.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698