| 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 139 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 150 virtual BrowserWindow* CreateBrowserWindow(); | 150 virtual BrowserWindow* CreateBrowserWindow(); |
| 151 | 151 |
| 152 // Creates the browser given |profile|, |browser_type|, |hosted_app|, | 152 // Creates the browser given |profile|, |browser_type|, |hosted_app|, |
| 153 // |host_desktop_type| and |browser_window|. The caller owns the return value. | 153 // |host_desktop_type| and |browser_window|. The caller owns the return value. |
| 154 virtual Browser* CreateBrowser(Profile* profile, | 154 virtual Browser* CreateBrowser(Profile* profile, |
| 155 Browser::Type browser_type, | 155 Browser::Type browser_type, |
| 156 bool hosted_app, | 156 bool hosted_app, |
| 157 chrome::HostDesktopType host_desktop_type, | 157 chrome::HostDesktopType host_desktop_type, |
| 158 BrowserWindow* browser_window); | 158 BrowserWindow* browser_window); |
| 159 | 159 |
| 160 #if defined(TOOLKIT_VIEWS) | 160 private: |
| 161 #if !defined(OS_CHROMEOS) && defined(TOOLKIT_VIEWS) |
| 161 // Creates the ViewsDelegate to use, may be overriden to create a different | 162 // Creates the ViewsDelegate to use, may be overriden to create a different |
| 162 // ViewsDelegate. | 163 // ViewsDelegate. |
| 163 virtual views::ViewsDelegate* CreateViewsDelegate(); | 164 views::ViewsDelegate* CreateViewsDelegate(); |
| 164 #endif | 165 #endif |
| 165 | 166 |
| 166 private: | |
| 167 // We need to create a MessageLoop, otherwise a bunch of things fails. | 167 // We need to create a MessageLoop, otherwise a bunch of things fails. |
| 168 content::TestBrowserThreadBundle thread_bundle_; | 168 content::TestBrowserThreadBundle thread_bundle_; |
| 169 base::ShadowingAtExitManager at_exit_manager_; | 169 base::ShadowingAtExitManager at_exit_manager_; |
| 170 | 170 |
| 171 #if defined(OS_CHROMEOS) | 171 #if defined(OS_CHROMEOS) |
| 172 chromeos::ScopedTestDeviceSettingsService test_device_settings_service_; | 172 chromeos::ScopedTestDeviceSettingsService test_device_settings_service_; |
| 173 chromeos::ScopedTestCrosSettings test_cros_settings_; | 173 chromeos::ScopedTestCrosSettings test_cros_settings_; |
| 174 chromeos::ScopedTestUserManager test_user_manager_; | 174 chromeos::ScopedTestUserManager test_user_manager_; |
| 175 #endif | 175 #endif |
| 176 | 176 |
| (...skipping 29 matching lines...) Expand all Loading... |
| 206 // The desktop to create the initial window on. | 206 // The desktop to create the initial window on. |
| 207 chrome::HostDesktopType host_desktop_type_; | 207 chrome::HostDesktopType host_desktop_type_; |
| 208 | 208 |
| 209 // Whether the browser is part of a hosted app. | 209 // Whether the browser is part of a hosted app. |
| 210 bool hosted_app_; | 210 bool hosted_app_; |
| 211 | 211 |
| 212 DISALLOW_COPY_AND_ASSIGN(BrowserWithTestWindowTest); | 212 DISALLOW_COPY_AND_ASSIGN(BrowserWithTestWindowTest); |
| 213 }; | 213 }; |
| 214 | 214 |
| 215 #endif // CHROME_TEST_BASE_BROWSER_WITH_TEST_WINDOW_TEST_H_ | 215 #endif // CHROME_TEST_BASE_BROWSER_WITH_TEST_WINDOW_TEST_H_ |
| OLD | NEW |