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 250 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
261 // If there is already an existing active incognito session for the specified | 261 // If there is already an existing active incognito session for the specified |
262 // |profile|, that session is re-used. | 262 // |profile|, that session is re-used. |
263 static void OpenURLOffTheRecord(Profile* profile, const GURL& url); | 263 static void OpenURLOffTheRecord(Profile* profile, const GURL& url); |
264 | 264 |
265 // Open |extension| in |container|, using |disposition| if container type is | 265 // Open |extension| in |container|, using |disposition| if container type is |
266 // TAB. Returns the TabContents* that was created or NULL. | 266 // TAB. Returns the TabContents* that was created or NULL. |
267 static TabContents* OpenApplication( | 267 static TabContents* OpenApplication( |
268 Profile* profile, | 268 Profile* profile, |
269 const Extension* extension, | 269 const Extension* extension, |
270 extension_misc::LaunchContainer container, | 270 extension_misc::LaunchContainer container, |
271 const GURL& override_url, | |
sky
2011/11/11 00:12:01
Add a description of override_url here and in Open
| |
271 WindowOpenDisposition disposition); | 272 WindowOpenDisposition disposition); |
272 | 273 |
273 // Opens a new application window for the specified url. If |as_panel| | 274 // Opens a new application window for the specified url. If |as_panel| |
274 // is true, the application will be opened as a Browser::Type::APP_PANEL in | 275 // is true, the application will be opened as a Browser::Type::APP_PANEL in |
275 // app panel window, otherwise it will be opened as as either | 276 // app panel window, otherwise it will be opened as as either |
276 // Browser::Type::APP a.k.a. "thin frame" (if |extension| is NULL) or | 277 // Browser::Type::APP a.k.a. "thin frame" (if |extension| is NULL) or |
277 // Browser::Type::EXTENSION_APP (if |extension| is non-NULL). | 278 // Browser::Type::EXTENSION_APP (if |extension| is non-NULL). |
278 // If |app_browser| is not NULL, it is set to the browser that hosts the | 279 // If |app_browser| is not NULL, it is set to the browser that hosts the |
279 // returned tab. | 280 // returned tab. |
280 static TabContents* OpenApplicationWindow( | 281 static TabContents* OpenApplicationWindow( |
(...skipping 10 matching lines...) Expand all Loading... | |
291 // is used to open the former. To open the latter, use | 292 // is used to open the former. To open the latter, use |
292 // Browser::OpenApplicationWindow(). | 293 // Browser::OpenApplicationWindow(). |
293 static TabContents* OpenAppShortcutWindow(Profile* profile, | 294 static TabContents* OpenAppShortcutWindow(Profile* profile, |
294 const GURL& url, | 295 const GURL& url, |
295 bool update_shortcut); | 296 bool update_shortcut); |
296 | 297 |
297 // Open an application for |extension| using |disposition|. Returns NULL if | 298 // Open an application for |extension| using |disposition|. Returns NULL if |
298 // there are no appropriate existing browser windows for |profile|. | 299 // there are no appropriate existing browser windows for |profile|. |
299 static TabContents* OpenApplicationTab(Profile* profile, | 300 static TabContents* OpenApplicationTab(Profile* profile, |
300 const Extension* extension, | 301 const Extension* extension, |
302 const GURL& override_url, | |
301 WindowOpenDisposition disposition); | 303 WindowOpenDisposition disposition); |
302 | 304 |
303 // Opens a new window and opens the bookmark manager. | 305 // Opens a new window and opens the bookmark manager. |
304 static void OpenBookmarkManagerWindow(Profile* profile); | 306 static void OpenBookmarkManagerWindow(Profile* profile); |
305 | 307 |
306 #if defined(OS_MACOSX) | 308 #if defined(OS_MACOSX) |
307 // Open a new window with history/downloads/help/options (needed on Mac when | 309 // Open a new window with history/downloads/help/options (needed on Mac when |
308 // there are no windows). | 310 // there are no windows). |
309 static void OpenHistoryWindow(Profile* profile); | 311 static void OpenHistoryWindow(Profile* profile); |
310 static void OpenDownloadsWindow(Profile* profile); | 312 static void OpenDownloadsWindow(Profile* profile); |
(...skipping 1155 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
1466 | 1468 |
1467 MouseLockState mouse_lock_state_; | 1469 MouseLockState mouse_lock_state_; |
1468 | 1470 |
1469 // True if the browser window has been shown at least once. | 1471 // True if the browser window has been shown at least once. |
1470 bool window_has_shown_; | 1472 bool window_has_shown_; |
1471 | 1473 |
1472 DISALLOW_COPY_AND_ASSIGN(Browser); | 1474 DISALLOW_COPY_AND_ASSIGN(Browser); |
1473 }; | 1475 }; |
1474 | 1476 |
1475 #endif // CHROME_BROWSER_UI_BROWSER_H_ | 1477 #endif // CHROME_BROWSER_UI_BROWSER_H_ |
OLD | NEW |