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

Side by Side Diff: ui/aura/test/aura_test_helper.cc

Issue 9664069: Move scoped_ole_initializer.h to ui/base/win and clean up ole initialization/uninitialization. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 8 years, 9 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/test/aura_test_helper.h ('k') | ui/base/win/scoped_ole_initializer.h » ('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 #if defined(OS_WIN)
8 #include <ole2.h>
9 #endif
10
11 #include "ui/aura/env.h" 7 #include "ui/aura/env.h"
12 #include "ui/aura/root_window.h" 8 #include "ui/aura/root_window.h"
13 #include "ui/gfx/compositor/layer_animator.h" 9 #include "ui/gfx/compositor/layer_animator.h"
14 10
15 namespace aura { 11 namespace aura {
16 namespace test { 12 namespace test {
17 13
18 AuraTestHelper::AuraTestHelper() 14 AuraTestHelper::AuraTestHelper()
19 : setup_called_(false), 15 : setup_called_(false),
20 teardown_called_(false) { 16 teardown_called_(false) {
21 #if defined(OS_WIN)
22 OleInitialize(NULL);
23 #endif
24
25 // Disable animations during tests. 17 // Disable animations during tests.
26 ui::LayerAnimator::set_disable_animations_for_test(true); 18 ui::LayerAnimator::set_disable_animations_for_test(true);
27 } 19 }
28 20
29 AuraTestHelper::~AuraTestHelper() { 21 AuraTestHelper::~AuraTestHelper() {
30 #if defined(OS_WIN)
31 OleUninitialize();
32 #endif
33 CHECK(setup_called_) 22 CHECK(setup_called_)
34 << "You have overridden SetUp but never called super class's SetUp"; 23 << "You have overridden SetUp but never called super class's SetUp";
35 CHECK(teardown_called_) 24 CHECK(teardown_called_)
36 << "You have overridden TearDown but never called super class's TearDown"; 25 << "You have overridden TearDown but never called super class's TearDown";
37 aura::Env::DeleteInstance(); 26 aura::Env::DeleteInstance();
38 } 27 }
39 28
40 void AuraTestHelper::InitRootWindow(RootWindow* root_window) { 29 void AuraTestHelper::InitRootWindow(RootWindow* root_window) {
41 root_window->Show(); 30 root_window->Show();
42 // Ensure width != height so tests won't confuse them. 31 // Ensure width != height so tests won't confuse them.
(...skipping 10 matching lines...) Expand all
53 42
54 void AuraTestHelper::RunAllPendingInMessageLoop(RootWindow* root_window) { 43 void AuraTestHelper::RunAllPendingInMessageLoop(RootWindow* root_window) {
55 #if !defined(OS_MACOSX) 44 #if !defined(OS_MACOSX)
56 message_loop_.RunAllPendingWithDispatcher( 45 message_loop_.RunAllPendingWithDispatcher(
57 Env::GetInstance()->GetDispatcher()); 46 Env::GetInstance()->GetDispatcher());
58 #endif 47 #endif
59 } 48 }
60 49
61 } // namespace test 50 } // namespace test
62 } // namespace aura 51 } // namespace aura
OLDNEW
« no previous file with comments | « ui/aura/test/aura_test_helper.h ('k') | ui/base/win/scoped_ole_initializer.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698