| 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/macros.h" | 9 #include "base/macros.h" |
| 10 #include "base/message_loop/message_loop.h" | 10 #include "base/message_loop/message_loop.h" |
| (...skipping 13 matching lines...) Expand all Loading... |
| 24 | 24 |
| 25 #if defined(OS_WIN) | 25 #if defined(OS_WIN) |
| 26 #include "ui/base/win/scoped_ole_initializer.h" | 26 #include "ui/base/win/scoped_ole_initializer.h" |
| 27 #endif | 27 #endif |
| 28 | 28 |
| 29 class GURL; | 29 class GURL; |
| 30 | 30 |
| 31 #if defined(OS_CHROMEOS) | 31 #if defined(OS_CHROMEOS) |
| 32 namespace ash { | 32 namespace ash { |
| 33 namespace test { | 33 namespace test { |
| 34 class AshTestEnvironment; |
| 34 class AshTestHelper; | 35 class AshTestHelper; |
| 35 } | 36 } |
| 36 } | 37 } |
| 37 #elif defined(TOOLKIT_VIEWS) | 38 #elif defined(TOOLKIT_VIEWS) |
| 38 namespace views { | 39 namespace views { |
| 39 class ScopedViewsTestHelper; | 40 class ScopedViewsTestHelper; |
| 40 } | 41 } |
| 41 #endif | 42 #endif |
| 42 | 43 |
| 43 namespace content { | 44 namespace content { |
| (...skipping 120 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 164 // frameworks. | 165 // frameworks. |
| 165 TestingProfile* profile_; | 166 TestingProfile* profile_; |
| 166 std::unique_ptr<BrowserWindow> window_; // Usually a TestBrowserWindow. | 167 std::unique_ptr<BrowserWindow> window_; // Usually a TestBrowserWindow. |
| 167 std::unique_ptr<Browser> browser_; | 168 std::unique_ptr<Browser> browser_; |
| 168 | 169 |
| 169 // The existence of this object enables tests via | 170 // The existence of this object enables tests via |
| 170 // RenderViewHostTester. | 171 // RenderViewHostTester. |
| 171 content::RenderViewHostTestEnabler rvh_test_enabler_; | 172 content::RenderViewHostTestEnabler rvh_test_enabler_; |
| 172 | 173 |
| 173 #if defined(OS_CHROMEOS) | 174 #if defined(OS_CHROMEOS) |
| 175 std::unique_ptr<ash::test::AshTestEnvironment> ash_test_environment_; |
| 174 std::unique_ptr<ash::test::AshTestHelper> ash_test_helper_; | 176 std::unique_ptr<ash::test::AshTestHelper> ash_test_helper_; |
| 175 #elif defined(TOOLKIT_VIEWS) | 177 #elif defined(TOOLKIT_VIEWS) |
| 176 std::unique_ptr<views::ScopedViewsTestHelper> views_test_helper_; | 178 std::unique_ptr<views::ScopedViewsTestHelper> views_test_helper_; |
| 177 #endif | 179 #endif |
| 178 | 180 |
| 179 #if defined(OS_WIN) | 181 #if defined(OS_WIN) |
| 180 ui::ScopedOleInitializer ole_initializer_; | 182 ui::ScopedOleInitializer ole_initializer_; |
| 181 #endif | 183 #endif |
| 182 | 184 |
| 183 // The type of browser to create (tabbed or popup). | 185 // The type of browser to create (tabbed or popup). |
| 184 Browser::Type browser_type_; | 186 Browser::Type browser_type_; |
| 185 | 187 |
| 186 // Whether the browser is part of a hosted app. | 188 // Whether the browser is part of a hosted app. |
| 187 bool hosted_app_; | 189 bool hosted_app_; |
| 188 | 190 |
| 189 DISALLOW_COPY_AND_ASSIGN(BrowserWithTestWindowTest); | 191 DISALLOW_COPY_AND_ASSIGN(BrowserWithTestWindowTest); |
| 190 }; | 192 }; |
| 191 | 193 |
| 192 #endif // CHROME_TEST_BASE_BROWSER_WITH_TEST_WINDOW_TEST_H_ | 194 #endif // CHROME_TEST_BASE_BROWSER_WITH_TEST_WINDOW_TEST_H_ |
| OLD | NEW |