| 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_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 264 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 275 // Open |extension| in |container|, using |disposition| if container type is | 275 // Open |extension| in |container|, using |disposition| if container type is |
| 276 // TAB. Returns the WebContents* that was created or NULL. If non-empty, | 276 // TAB. Returns the WebContents* that was created or NULL. If non-empty, |
| 277 // |override_url| is used in place of the app launch url. | 277 // |override_url| is used in place of the app launch url. |
| 278 static content::WebContents* OpenApplication( | 278 static content::WebContents* OpenApplication( |
| 279 Profile* profile, | 279 Profile* profile, |
| 280 const Extension* extension, | 280 const Extension* extension, |
| 281 extension_misc::LaunchContainer container, | 281 extension_misc::LaunchContainer container, |
| 282 const GURL& override_url, | 282 const GURL& override_url, |
| 283 WindowOpenDisposition disposition); | 283 WindowOpenDisposition disposition); |
| 284 | 284 |
| 285 #if defined(USE_AURA) | 285 #if defined(USE_ASH) |
| 286 // Opens |url| in a new application panel window for the specified url. | 286 // Opens |url| in a new application panel window for the specified url. |
| 287 static content::WebContents* OpenApplicationPanel( | 287 static content::WebContents* OpenApplicationPanel( |
| 288 Profile* profile, | 288 Profile* profile, |
| 289 const Extension* extension, | 289 const Extension* extension, |
| 290 const GURL& url); | 290 const GURL& url); |
| 291 #endif | 291 #endif |
| 292 | 292 |
| 293 // Opens a new application window for the specified url. If |as_panel| | 293 // Opens a new application window for the specified url. If |as_panel| |
| 294 // is true, the application will be opened as a Browser::Type::APP_PANEL in | 294 // is true, the application will be opened as a Browser::Type::APP_PANEL in |
| 295 // app panel window, otherwise it will be opened as as either | 295 // app panel window, otherwise it will be opened as as either |
| (...skipping 1175 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1471 | 1471 |
| 1472 scoped_ptr<ExtensionWindowController> extension_window_controller_; | 1472 scoped_ptr<ExtensionWindowController> extension_window_controller_; |
| 1473 | 1473 |
| 1474 // True if the browser window has been shown at least once. | 1474 // True if the browser window has been shown at least once. |
| 1475 bool window_has_shown_; | 1475 bool window_has_shown_; |
| 1476 | 1476 |
| 1477 DISALLOW_COPY_AND_ASSIGN(Browser); | 1477 DISALLOW_COPY_AND_ASSIGN(Browser); |
| 1478 }; | 1478 }; |
| 1479 | 1479 |
| 1480 #endif // CHROME_BROWSER_UI_BROWSER_H_ | 1480 #endif // CHROME_BROWSER_UI_BROWSER_H_ |
| OLD | NEW |