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

Side by Side Diff: ui/views/test/views_test_base.h

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/views/examples/examples_main.cc ('k') | ui/views/test/views_test_base.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 #ifndef UI_VIEWS_TEST_VIEWS_TEST_BASE_H_ 5 #ifndef UI_VIEWS_TEST_VIEWS_TEST_BASE_H_
6 #define UI_VIEWS_TEST_VIEWS_TEST_BASE_H_ 6 #define UI_VIEWS_TEST_VIEWS_TEST_BASE_H_
7 #pragma once 7 #pragma once
8 8
9 #include "base/memory/scoped_ptr.h" 9 #include "base/memory/scoped_ptr.h"
10 #include "base/message_loop.h" 10 #include "base/message_loop.h"
11 #include "testing/gtest/include/gtest/gtest.h" 11 #include "testing/gtest/include/gtest/gtest.h"
12 #include "ui/views/test/test_views_delegate.h" 12 #include "ui/views/test/test_views_delegate.h"
13 13
14 #if defined(OS_WIN)
15 #include "ui/base/win/scoped_ole_initializer.h"
16 #endif
17
14 namespace aura { 18 namespace aura {
15 class RootWindow; 19 class RootWindow;
16 namespace test { 20 namespace test {
17 class TestActivationClient; 21 class TestActivationClient;
18 class TestStackingClient; 22 class TestStackingClient;
19 } 23 }
20 } 24 }
21 25
22 namespace ui { 26 namespace ui {
23 class InputMethod; 27 class InputMethod;
(...skipping 30 matching lines...) Expand all
54 scoped_ptr<TestViewsDelegate> views_delegate_; 58 scoped_ptr<TestViewsDelegate> views_delegate_;
55 #if defined(USE_AURA) 59 #if defined(USE_AURA)
56 scoped_ptr<aura::RootWindow> root_window_; 60 scoped_ptr<aura::RootWindow> root_window_;
57 scoped_ptr<aura::test::TestActivationClient> test_activation_client_; 61 scoped_ptr<aura::test::TestActivationClient> test_activation_client_;
58 scoped_ptr<aura::test::TestStackingClient> test_stacking_client_; 62 scoped_ptr<aura::test::TestStackingClient> test_stacking_client_;
59 scoped_ptr<ui::InputMethod> test_input_method_; 63 scoped_ptr<ui::InputMethod> test_input_method_;
60 #endif 64 #endif
61 bool setup_called_; 65 bool setup_called_;
62 bool teardown_called_; 66 bool teardown_called_;
63 67
68 #if defined(OS_WIN)
69 ui::ScopedOleInitializer ole_initializer_;
70 #endif
71
64 DISALLOW_COPY_AND_ASSIGN(ViewsTestBase); 72 DISALLOW_COPY_AND_ASSIGN(ViewsTestBase);
65 }; 73 };
66 74
67 } // namespace views 75 } // namespace views
68 76
69 #endif // UI_VIEWS_TEST_VIEWS_TEST_BASE_H_ 77 #endif // UI_VIEWS_TEST_VIEWS_TEST_BASE_H_
OLDNEW
« no previous file with comments | « ui/views/examples/examples_main.cc ('k') | ui/views/test/views_test_base.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698