| 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_STARTUP_STARTUP_BROWSER_CREATOR_IMPL_H_ | 5 #ifndef CHROME_BROWSER_UI_STARTUP_STARTUP_BROWSER_CREATOR_IMPL_H_ |
| 6 #define CHROME_BROWSER_UI_STARTUP_STARTUP_BROWSER_CREATOR_IMPL_H_ | 6 #define CHROME_BROWSER_UI_STARTUP_STARTUP_BROWSER_CREATOR_IMPL_H_ |
| 7 | 7 |
| 8 #include <string> | 8 #include <string> |
| 9 #include <vector> | 9 #include <vector> |
| 10 | 10 |
| (...skipping 60 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 71 // are added to is returned, which is either |browser| or the newly created | 71 // are added to is returned, which is either |browser| or the newly created |
| 72 // browser. | 72 // browser. |
| 73 Browser* OpenTabsInBrowser(Browser* browser, | 73 Browser* OpenTabsInBrowser(Browser* browser, |
| 74 bool process_startup, | 74 bool process_startup, |
| 75 const StartupTabs& tabs, | 75 const StartupTabs& tabs, |
| 76 chrome::HostDesktopType desktop_type); | 76 chrome::HostDesktopType desktop_type); |
| 77 | 77 |
| 78 private: | 78 private: |
| 79 FRIEND_TEST_ALL_PREFIXES(BrowserTest, RestorePinnedTabs); | 79 FRIEND_TEST_ALL_PREFIXES(BrowserTest, RestorePinnedTabs); |
| 80 FRIEND_TEST_ALL_PREFIXES(BrowserTest, AppIdSwitch); | 80 FRIEND_TEST_ALL_PREFIXES(BrowserTest, AppIdSwitch); |
| 81 FRIEND_TEST_ALL_PREFIXES(PermissionBubbleCocoaAppTest, AppHasNoLocationBar); |
| 81 | 82 |
| 82 // If the process was launched with the web application command line flags, | 83 // If the process was launched with the web application command line flags, |
| 83 // e.g. --app=http://www.google.com/ or --app_id=... return true. | 84 // e.g. --app=http://www.google.com/ or --app_id=... return true. |
| 84 // In this case |app_url| or |app_id| are populated if they're non-null. | 85 // In this case |app_url| or |app_id| are populated if they're non-null. |
| 85 bool IsAppLaunch(std::string* app_url, std::string* app_id); | 86 bool IsAppLaunch(std::string* app_url, std::string* app_id); |
| 86 | 87 |
| 87 // If IsAppLaunch is true, tries to open an application window. | 88 // If IsAppLaunch is true, tries to open an application window. |
| 88 // If the app is specified to start in a tab, or IsAppLaunch is false, | 89 // If the app is specified to start in a tab, or IsAppLaunch is false, |
| 89 // returns false to specify default processing. |out_app_contents| is an | 90 // returns false to specify default processing. |out_app_contents| is an |
| 90 // optional argument to receive the created WebContents for the app. | 91 // optional argument to receive the created WebContents for the app. |
| (...skipping 56 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 147 | 148 |
| 148 const base::FilePath cur_dir_; | 149 const base::FilePath cur_dir_; |
| 149 const base::CommandLine& command_line_; | 150 const base::CommandLine& command_line_; |
| 150 Profile* profile_; | 151 Profile* profile_; |
| 151 StartupBrowserCreator* browser_creator_; | 152 StartupBrowserCreator* browser_creator_; |
| 152 bool is_first_run_; | 153 bool is_first_run_; |
| 153 DISALLOW_COPY_AND_ASSIGN(StartupBrowserCreatorImpl); | 154 DISALLOW_COPY_AND_ASSIGN(StartupBrowserCreatorImpl); |
| 154 }; | 155 }; |
| 155 | 156 |
| 156 #endif // CHROME_BROWSER_UI_STARTUP_STARTUP_BROWSER_CREATOR_IMPL_H_ | 157 #endif // CHROME_BROWSER_UI_STARTUP_STARTUP_BROWSER_CREATOR_IMPL_H_ |
| OLD | NEW |