| OLD | NEW |
| 1 // Copyright (c) 2010 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2010 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 232 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 243 // is true, the application will be opened as a Browser::Type::APP_PANEL in | 243 // is true, the application will be opened as a Browser::Type::APP_PANEL in |
| 244 // app panel window, otherwise it will be opened as as either | 244 // app panel window, otherwise it will be opened as as either |
| 245 // Browser::Type::APP a.k.a. "thin frame" (if |extension| is NULL) or | 245 // Browser::Type::APP a.k.a. "thin frame" (if |extension| is NULL) or |
| 246 // Browser::Type::EXTENSION_APP (if |extension| is non-NULL). | 246 // Browser::Type::EXTENSION_APP (if |extension| is non-NULL). |
| 247 static TabContents* OpenApplicationWindow( | 247 static TabContents* OpenApplicationWindow( |
| 248 Profile* profile, | 248 Profile* profile, |
| 249 const Extension* extension, | 249 const Extension* extension, |
| 250 extension_misc::LaunchContainer container, | 250 extension_misc::LaunchContainer container, |
| 251 const GURL& url); | 251 const GURL& url); |
| 252 | 252 |
| 253 // Open an application in a new application window. Used to implement | 253 // Open an application for |extension| in a new application window or panel. |
| 254 // app shortcuts. | 254 static TabContents* OpenApplicationWindow(Profile* profile, GURL& url); |
| 255 static TabContents* OpenApplicationWindow(Profile* profile, const GURL& url); | |
| 256 | 255 |
| 257 // Open an application for |extension| in a new application tab, or | 256 // Open an application for |extension| in a new application tab, or |
| 258 // |existing_tab| if not NULL. Returns NULL if there are no appropriate | 257 // |existing_tab| if not NULL. Returns NULL if there are no appropriate |
| 259 // existing browser windows for |profile|. | 258 // existing browser windows for |profile|. |
| 260 static TabContents* OpenApplicationTab(Profile* profile, | 259 static TabContents* OpenApplicationTab(Profile* profile, |
| 261 const Extension* extension, | 260 const Extension* extension, |
| 262 TabContents* existing_tab); | 261 TabContents* existing_tab); |
| 263 | 262 |
| 264 // Opens a new window and opens the bookmark manager. | 263 // Opens a new window and opens the bookmark manager. |
| 265 static void OpenBookmarkManagerWindow(Profile* profile); | 264 static void OpenBookmarkManagerWindow(Profile* profile); |
| (...skipping 841 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1107 // The profile's tab restore service. The service is owned by the profile, | 1106 // The profile's tab restore service. The service is owned by the profile, |
| 1108 // and we install ourselves as an observer. | 1107 // and we install ourselves as an observer. |
| 1109 TabRestoreService* tab_restore_service_; | 1108 TabRestoreService* tab_restore_service_; |
| 1110 | 1109 |
| 1111 scoped_ptr<InstantController> instant_; | 1110 scoped_ptr<InstantController> instant_; |
| 1112 | 1111 |
| 1113 DISALLOW_COPY_AND_ASSIGN(Browser); | 1112 DISALLOW_COPY_AND_ASSIGN(Browser); |
| 1114 }; | 1113 }; |
| 1115 | 1114 |
| 1116 #endif // CHROME_BROWSER_UI_BROWSER_H_ | 1115 #endif // CHROME_BROWSER_UI_BROWSER_H_ |
| OLD | NEW |