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

Side by Side Diff: chrome/test/base/browser_with_test_window_test.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 | « chrome/chrome_exe.gypi ('k') | chrome/test/base/browser_with_test_window_test.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 CHROME_TEST_BASE_BROWSER_WITH_TEST_WINDOW_TEST_H_ 5 #ifndef CHROME_TEST_BASE_BROWSER_WITH_TEST_WINDOW_TEST_H_
6 #define CHROME_TEST_BASE_BROWSER_WITH_TEST_WINDOW_TEST_H_ 6 #define CHROME_TEST_BASE_BROWSER_WITH_TEST_WINDOW_TEST_H_
7 #pragma once 7 #pragma once
8 8
9 #include "base/message_loop.h" 9 #include "base/message_loop.h"
10 #include "chrome/browser/ui/browser.h" 10 #include "chrome/browser/ui/browser.h"
11 #include "chrome/test/base/test_browser_window.h" 11 #include "chrome/test/base/test_browser_window.h"
12 #include "chrome/test/base/testing_profile.h" 12 #include "chrome/test/base/testing_profile.h"
13 #include "content/browser/renderer_host/test_render_view_host.h" 13 #include "content/browser/renderer_host/test_render_view_host.h"
14 #include "content/test/test_browser_thread.h" 14 #include "content/test/test_browser_thread.h"
15 #include "testing/gtest/include/gtest/gtest.h" 15 #include "testing/gtest/include/gtest/gtest.h"
16 16
17 #if defined(OS_WIN)
18 #include "ui/base/win/scoped_ole_initializer.h"
19 #endif
20
17 class GURL; 21 class GURL;
18 22
19 #if defined(USE_AURA) 23 #if defined(USE_AURA)
20 namespace aura { 24 namespace aura {
21 class RootWindow; 25 class RootWindow;
22 namespace test { 26 namespace test {
23 class TestActivationClient; 27 class TestActivationClient;
24 class TestStackingClient; 28 class TestStackingClient;
25 } 29 }
26 } 30 }
(...skipping 96 matching lines...) Expand 10 before | Expand all | Expand 10 after
123 127
124 MockRenderProcessHostFactory rph_factory_; 128 MockRenderProcessHostFactory rph_factory_;
125 TestRenderViewHostFactory rvh_factory_; 129 TestRenderViewHostFactory rvh_factory_;
126 130
127 #if defined(USE_AURA) 131 #if defined(USE_AURA)
128 scoped_ptr<aura::RootWindow> root_window_; 132 scoped_ptr<aura::RootWindow> root_window_;
129 scoped_ptr<aura::test::TestActivationClient> test_activation_client_; 133 scoped_ptr<aura::test::TestActivationClient> test_activation_client_;
130 scoped_ptr<aura::test::TestStackingClient> test_stacking_client_; 134 scoped_ptr<aura::test::TestStackingClient> test_stacking_client_;
131 #endif 135 #endif
132 136
137 #if defined(OS_WIN)
138 ui::ScopedOleInitializer ole_initializer_;
139 #endif
140
133 DISALLOW_COPY_AND_ASSIGN(BrowserWithTestWindowTest); 141 DISALLOW_COPY_AND_ASSIGN(BrowserWithTestWindowTest);
134 }; 142 };
135 143
136 #endif // CHROME_TEST_BASE_BROWSER_WITH_TEST_WINDOW_TEST_H_ 144 #endif // CHROME_TEST_BASE_BROWSER_WITH_TEST_WINDOW_TEST_H_
OLDNEW
« no previous file with comments | « chrome/chrome_exe.gypi ('k') | chrome/test/base/browser_with_test_window_test.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698