Chromium Code Reviews| 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 88 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 99 | 99 |
| 100 // Invoked from Launch to handle processing of urls. This may do any of the | 100 // Invoked from Launch to handle processing of urls. This may do any of the |
| 101 // following: | 101 // following: |
| 102 // . Invoke ProcessStartupURLs if |process_startup| is true. | 102 // . Invoke ProcessStartupURLs if |process_startup| is true. |
| 103 // . If |process_startup| is false, restore the last session if necessary, | 103 // . If |process_startup| is false, restore the last session if necessary, |
| 104 // or invoke ProcessSpecifiedURLs. | 104 // or invoke ProcessSpecifiedURLs. |
| 105 // . Open the urls directly. | 105 // . Open the urls directly. |
| 106 void ProcessLaunchURLs(bool process_startup, | 106 void ProcessLaunchURLs(bool process_startup, |
| 107 const std::vector<GURL>& urls_to_open); | 107 const std::vector<GURL>& urls_to_open); |
| 108 | 108 |
| 109 void ProcessLaunchURLsUsingNewFlow(bool process_startup, | |
| 110 const std::vector<GURL>& urls_to_open); | |
|
Roger Tawa OOO till Jul 10th
2016/07/26 15:00:26
The word "new" is discouraged in the code base, si
tmartino
2016/07/27 18:40:44
Done.
| |
| 111 | |
| 112 Browser* MaybeRestoreSession(const std::vector<GURL>& urls, | |
| 113 bool is_process_startup); | |
| 114 | |
| 109 // Does the following: | 115 // Does the following: |
| 110 // . If the user's startup pref is to restore the last session (or the | 116 // . If the user's startup pref is to restore the last session (or the |
| 111 // command line flag is present to force using last session), it is | 117 // command line flag is present to force using last session), it is |
| 112 // restored. | 118 // restored. |
| 113 // . Otherwise invoke ProcessSpecifiedURLs | 119 // . Otherwise invoke ProcessSpecifiedURLs |
| 114 // If a browser was created, true is returned. Otherwise returns false and | 120 // If a browser was created, true is returned. Otherwise returns false and |
| 115 // the caller must create a new browser. | 121 // the caller must create a new browser. |
| 116 bool ProcessStartupURLs(const std::vector<GURL>& urls_to_open); | 122 bool ProcessStartupURLs(const std::vector<GURL>& urls_to_open); |
| 117 | 123 |
| 118 // Invoked from either ProcessLaunchURLs or ProcessStartupURLs to handle | 124 // Invoked from either ProcessLaunchURLs or ProcessStartupURLs to handle |
| (...skipping 39 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 158 const base::FilePath cur_dir_; | 164 const base::FilePath cur_dir_; |
| 159 const base::CommandLine& command_line_; | 165 const base::CommandLine& command_line_; |
| 160 Profile* profile_; | 166 Profile* profile_; |
| 161 StartupBrowserCreator* browser_creator_; | 167 StartupBrowserCreator* browser_creator_; |
| 162 bool is_first_run_; | 168 bool is_first_run_; |
| 163 WelcomeRunType welcome_run_type_; | 169 WelcomeRunType welcome_run_type_; |
| 164 DISALLOW_COPY_AND_ASSIGN(StartupBrowserCreatorImpl); | 170 DISALLOW_COPY_AND_ASSIGN(StartupBrowserCreatorImpl); |
| 165 }; | 171 }; |
| 166 | 172 |
| 167 #endif // CHROME_BROWSER_UI_STARTUP_STARTUP_BROWSER_CREATOR_IMPL_H_ | 173 #endif // CHROME_BROWSER_UI_STARTUP_STARTUP_BROWSER_CREATOR_IMPL_H_ |
| OLD | NEW |