| OLD | NEW |
| 1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2011 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_BROWSER_UI_BROWSER_H_ | 5 #ifndef CHROME_BROWSER_UI_BROWSER_H_ |
| 6 #define CHROME_BROWSER_UI_BROWSER_H_ | 6 #define CHROME_BROWSER_UI_BROWSER_H_ |
| 7 #pragma once | 7 #pragma once |
| 8 | 8 |
| 9 #include <map> | 9 #include <map> |
| 10 #include <set> | 10 #include <set> |
| (...skipping 117 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 128 // be called after configuration for window() to be valid. | 128 // be called after configuration for window() to be valid. |
| 129 // Avoid using this constructor directly if you can use one of the Create*() | 129 // Avoid using this constructor directly if you can use one of the Create*() |
| 130 // methods below. This applies to almost all non-testing code. | 130 // methods below. This applies to almost all non-testing code. |
| 131 Browser(Type type, Profile* profile); | 131 Browser(Type type, Profile* profile); |
| 132 virtual ~Browser(); | 132 virtual ~Browser(); |
| 133 | 133 |
| 134 // Creates a normal tabbed browser with the specified profile. The Browser's | 134 // Creates a normal tabbed browser with the specified profile. The Browser's |
| 135 // window is created by this function call. | 135 // window is created by this function call. |
| 136 static Browser* Create(Profile* profile); | 136 static Browser* Create(Profile* profile); |
| 137 | 137 |
| 138 // Like Create, but creates a browser of the specified (popup) type, with the | |
| 139 // specified contents, in a popup window of the specified size/position. | |
| 140 static Browser* CreateForPopup(Type type, Profile* profile, | |
| 141 TabContents* new_contents, | |
| 142 const gfx::Rect& initial_bounds); | |
| 143 | |
| 144 // Like Create, but creates a browser of the specified type. | 138 // Like Create, but creates a browser of the specified type. |
| 145 static Browser* CreateForType(Type type, Profile* profile); | 139 static Browser* CreateForType(Type type, Profile* profile); |
| 146 | 140 |
| 147 // Like Create, but creates a toolbar-less "app" window for the specified | 141 // Like Create, but creates a toolbar-less "app" window for the specified |
| 148 // app. |app_name| is required and is used to identify the window to the | 142 // app. |app_name| is required and is used to identify the window to the |
| 149 // shell. If |extension| is set, it is used to determine the size of the | 143 // shell. If |extension| is set, it is used to determine the size of the |
| 150 // window to open. | 144 // window to open. |
| 151 static Browser* CreateForApp(const std::string& app_name, | 145 static Browser* CreateForApp(const std::string& app_name, |
| 152 const gfx::Size& window_size, | 146 const gfx::Size& window_size, |
| 153 Profile* profile, | 147 Profile* profile, |
| (...skipping 1019 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1173 // Helper which implements the TabRestoreServiceDelegate interface. | 1167 // Helper which implements the TabRestoreServiceDelegate interface. |
| 1174 scoped_ptr<BrowserTabRestoreServiceDelegate> tab_restore_service_delegate_; | 1168 scoped_ptr<BrowserTabRestoreServiceDelegate> tab_restore_service_delegate_; |
| 1175 | 1169 |
| 1176 scoped_ptr<InstantController> instant_; | 1170 scoped_ptr<InstantController> instant_; |
| 1177 scoped_ptr<InstantUnloadHandler> instant_unload_handler_; | 1171 scoped_ptr<InstantUnloadHandler> instant_unload_handler_; |
| 1178 | 1172 |
| 1179 DISALLOW_COPY_AND_ASSIGN(Browser); | 1173 DISALLOW_COPY_AND_ASSIGN(Browser); |
| 1180 }; | 1174 }; |
| 1181 | 1175 |
| 1182 #endif // CHROME_BROWSER_UI_BROWSER_H_ | 1176 #endif // CHROME_BROWSER_UI_BROWSER_H_ |
| OLD | NEW |