| 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 209 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 220 static void OpenWindowWithRestoredTabs(Profile* profile); | 220 static void OpenWindowWithRestoredTabs(Profile* profile); |
| 221 | 221 |
| 222 // Opens the specified URL in a new browser window in an incognito session. | 222 // Opens the specified URL in a new browser window in an incognito session. |
| 223 // If there is already an existing active incognito session for the specified | 223 // If there is already an existing active incognito session for the specified |
| 224 // |profile|, that session is re-used. | 224 // |profile|, that session is re-used. |
| 225 static void OpenURLOffTheRecord(Profile* profile, const GURL& url); | 225 static void OpenURLOffTheRecord(Profile* profile, const GURL& url); |
| 226 | 226 |
| 227 // Open an application specified by |app_id| in the appropriate launch | 227 // Open an application specified by |app_id| in the appropriate launch |
| 228 // container. |existing_tab| is reused if it is not NULL and the launch | 228 // container. |existing_tab| is reused if it is not NULL and the launch |
| 229 // container is a tab. Returns NULL if the app_id is invalid or if | 229 // container is a tab. Returns NULL if the app_id is invalid or if |
| 230 // ExtensionsService isn't ready/available. | 230 // ExtensionService isn't ready/available. |
| 231 static TabContents* OpenApplication(Profile* profile, | 231 static TabContents* OpenApplication(Profile* profile, |
| 232 const std::string& app_id, | 232 const std::string& app_id, |
| 233 TabContents* existing_tab); | 233 TabContents* existing_tab); |
| 234 | 234 |
| 235 // Open |extension| in |container|, using |existing_tab| if not NULL and if | 235 // Open |extension| in |container|, using |existing_tab| if not NULL and if |
| 236 // the correct container type. Returns the TabContents* that was created or | 236 // the correct container type. Returns the TabContents* that was created or |
| 237 // NULL. | 237 // NULL. |
| 238 static TabContents* OpenApplication( | 238 static TabContents* OpenApplication( |
| 239 Profile* profile, | 239 Profile* profile, |
| 240 const Extension* extension, | 240 const Extension* extension, |
| (...skipping 879 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1120 // and we install ourselves as an observer. | 1120 // and we install ourselves as an observer. |
| 1121 TabRestoreService* tab_restore_service_; | 1121 TabRestoreService* tab_restore_service_; |
| 1122 | 1122 |
| 1123 scoped_ptr<InstantController> instant_; | 1123 scoped_ptr<InstantController> instant_; |
| 1124 scoped_ptr<InstantUnloadHandler> instant_unload_handler_; | 1124 scoped_ptr<InstantUnloadHandler> instant_unload_handler_; |
| 1125 | 1125 |
| 1126 DISALLOW_COPY_AND_ASSIGN(Browser); | 1126 DISALLOW_COPY_AND_ASSIGN(Browser); |
| 1127 }; | 1127 }; |
| 1128 | 1128 |
| 1129 #endif // CHROME_BROWSER_UI_BROWSER_H_ | 1129 #endif // CHROME_BROWSER_UI_BROWSER_H_ |
| OLD | NEW |