OLD | NEW |
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 | 7 |
8 #include "base/at_exit.h" | 8 #include "base/at_exit.h" |
9 #include "base/message_loop/message_loop.h" | 9 #include "base/message_loop/message_loop.h" |
10 #include "chrome/browser/ui/browser.h" | 10 #include "chrome/browser/ui/browser.h" |
(...skipping 18 matching lines...) Expand all Loading... |
29 | 29 |
30 #if defined(USE_ASH) | 30 #if defined(USE_ASH) |
31 namespace ash { | 31 namespace ash { |
32 namespace test { | 32 namespace test { |
33 class AshTestHelper; | 33 class AshTestHelper; |
34 } | 34 } |
35 } | 35 } |
36 #endif | 36 #endif |
37 | 37 |
38 #if defined(USE_AURA) | 38 #if defined(USE_AURA) |
39 namespace aura { | 39 namespace wm { |
40 namespace test { | 40 class WMTestHelper; |
41 class AuraTestHelper; | |
42 } | |
43 } | 41 } |
44 #endif | 42 #endif |
45 | 43 |
46 #if defined(TOOLKIT_VIEWS) | 44 #if defined(TOOLKIT_VIEWS) |
47 namespace views { | 45 namespace views { |
48 class ViewsDelegate; | 46 class ViewsDelegate; |
49 } | 47 } |
50 #endif | 48 #endif |
51 | 49 |
52 namespace content { | 50 namespace content { |
(...skipping 129 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
182 scoped_ptr<Browser> browser_; | 180 scoped_ptr<Browser> browser_; |
183 | 181 |
184 // The existence of this object enables tests via | 182 // The existence of this object enables tests via |
185 // RenderViewHostTester. | 183 // RenderViewHostTester. |
186 content::RenderViewHostTestEnabler rvh_test_enabler_; | 184 content::RenderViewHostTestEnabler rvh_test_enabler_; |
187 | 185 |
188 #if defined(USE_ASH) | 186 #if defined(USE_ASH) |
189 scoped_ptr<ash::test::AshTestHelper> ash_test_helper_; | 187 scoped_ptr<ash::test::AshTestHelper> ash_test_helper_; |
190 #endif | 188 #endif |
191 #if defined(USE_AURA) | 189 #if defined(USE_AURA) |
192 scoped_ptr<aura::test::AuraTestHelper> aura_test_helper_; | 190 scoped_ptr<wm::WMTestHelper> wm_test_helper_; |
193 #endif | 191 #endif |
194 | 192 |
195 #if defined(TOOLKIT_VIEWS) | 193 #if defined(TOOLKIT_VIEWS) |
196 scoped_ptr<views::ViewsDelegate> views_delegate_; | 194 scoped_ptr<views::ViewsDelegate> views_delegate_; |
197 #endif | 195 #endif |
198 | 196 |
199 #if defined(OS_WIN) | 197 #if defined(OS_WIN) |
200 ui::ScopedOleInitializer ole_initializer_; | 198 ui::ScopedOleInitializer ole_initializer_; |
201 #endif | 199 #endif |
202 | 200 |
203 // The type of browser to create (tabbed or popup). | 201 // The type of browser to create (tabbed or popup). |
204 Browser::Type browser_type_; | 202 Browser::Type browser_type_; |
205 | 203 |
206 // The desktop to create the initial window on. | 204 // The desktop to create the initial window on. |
207 chrome::HostDesktopType host_desktop_type_; | 205 chrome::HostDesktopType host_desktop_type_; |
208 | 206 |
209 // Whether the browser is part of a hosted app. | 207 // Whether the browser is part of a hosted app. |
210 bool hosted_app_; | 208 bool hosted_app_; |
211 | 209 |
212 DISALLOW_COPY_AND_ASSIGN(BrowserWithTestWindowTest); | 210 DISALLOW_COPY_AND_ASSIGN(BrowserWithTestWindowTest); |
213 }; | 211 }; |
214 | 212 |
215 #endif // CHROME_TEST_BASE_BROWSER_WITH_TEST_WINDOW_TEST_H_ | 213 #endif // CHROME_TEST_BASE_BROWSER_WITH_TEST_WINDOW_TEST_H_ |
OLD | NEW |