| 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_INIT_H_ | 5 #ifndef CHROME_BROWSER_UI_BROWSER_INIT_H_ | 
| 6 #define CHROME_BROWSER_UI_BROWSER_INIT_H_ | 6 #define CHROME_BROWSER_UI_BROWSER_INIT_H_ | 
| 7 #pragma once | 7 #pragma once | 
| 8 | 8 | 
| 9 #include <string> | 9 #include <string> | 
| 10 #include <vector> | 10 #include <vector> | 
| (...skipping 108 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 119     // and a tabbed browser, the tabs are added to it. Otherwise a new tabbed | 119     // and a tabbed browser, the tabs are added to it. Otherwise a new tabbed | 
| 120     // browser is created and the tabs are added to it. The browser the tabs | 120     // browser is created and the tabs are added to it. The browser the tabs | 
| 121     // are added to is returned, which is either |browser| or the newly created | 121     // are added to is returned, which is either |browser| or the newly created | 
| 122     // browser. | 122     // browser. | 
| 123     Browser* OpenTabsInBrowser(Browser* browser, | 123     Browser* OpenTabsInBrowser(Browser* browser, | 
| 124                                bool process_startup, | 124                                bool process_startup, | 
| 125                                const std::vector<Tab>& tabs); | 125                                const std::vector<Tab>& tabs); | 
| 126 | 126 | 
| 127    private: | 127    private: | 
| 128     FRIEND_TEST_ALL_PREFIXES(BrowserTest, RestorePinnedTabs); | 128     FRIEND_TEST_ALL_PREFIXES(BrowserTest, RestorePinnedTabs); | 
|  | 129     FRIEND_TEST_ALL_PREFIXES(BrowserTest, AppIdSwitch); | 
| 129 | 130 | 
| 130     // If the process was launched with the web application command line flags, | 131     // If the process was launched with the web application command line flags, | 
| 131     // e.g. --app=http://www.google.com/ or --app_id=... return true. | 132     // e.g. --app=http://www.google.com/ or --app_id=... return true. | 
| 132     // In this case |app_url| or |app_id| are populated if they're non-null. | 133     // In this case |app_url| or |app_id| are populated if they're non-null. | 
| 133     bool IsAppLaunch(std::string* app_url, std::string* app_id); | 134     bool IsAppLaunch(std::string* app_url, std::string* app_id); | 
| 134 | 135 | 
| 135     // If IsAppLaunch is true, tries to open an application window. | 136     // If IsAppLaunch is true, tries to open an application window. | 
| 136     // If the app is specified to start in a tab, or IsAppLaunch is false, | 137     // If the app is specified to start in a tab, or IsAppLaunch is false, | 
| 137     // returns false to specify default processing. | 138     // returns false to specify default processing. | 
| 138     bool OpenApplicationWindow(Profile* profile); | 139     bool OpenApplicationWindow(Profile* profile); | 
| (...skipping 51 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 190                                  Profile* profile, int* return_code, | 191                                  Profile* profile, int* return_code, | 
| 191                                  BrowserInit* browser_init); | 192                                  BrowserInit* browser_init); | 
| 192 | 193 | 
| 193   // Additional tabs to open during first run. | 194   // Additional tabs to open during first run. | 
| 194   std::vector<GURL> first_run_tabs_; | 195   std::vector<GURL> first_run_tabs_; | 
| 195 | 196 | 
| 196   DISALLOW_COPY_AND_ASSIGN(BrowserInit); | 197   DISALLOW_COPY_AND_ASSIGN(BrowserInit); | 
| 197 }; | 198 }; | 
| 198 | 199 | 
| 199 #endif  // CHROME_BROWSER_UI_BROWSER_INIT_H_ | 200 #endif  // CHROME_BROWSER_UI_BROWSER_INIT_H_ | 
| OLD | NEW | 
|---|