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 120 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
131 Browser* browser, | 131 Browser* browser, |
132 chrome::startup::IsProcessStartup is_process_startup); | 132 chrome::startup::IsProcessStartup is_process_startup); |
133 | 133 |
134 // Adds additional startup URLs to the specified vector. | 134 // Adds additional startup URLs to the specified vector. |
135 void AddStartupURLs(std::vector<GURL>* startup_urls) const; | 135 void AddStartupURLs(std::vector<GURL>* startup_urls) const; |
136 | 136 |
137 // Checks whether the Preferences backup is invalid and notifies user in | 137 // Checks whether the Preferences backup is invalid and notifies user in |
138 // that case. | 138 // that case. |
139 void CheckPreferencesBackup(Profile* profile); | 139 void CheckPreferencesBackup(Profile* profile); |
140 | 140 |
| 141 // Function to open startup urls in an existing Browser instance for the |
| 142 // profile passed in. Returns true on success. |
| 143 static bool OpenStartupURLsInExistingBrowser( |
| 144 Profile* profile, |
| 145 const std::vector<GURL>& startup_urls); |
| 146 |
141 const FilePath cur_dir_; | 147 const FilePath cur_dir_; |
142 const CommandLine& command_line_; | 148 const CommandLine& command_line_; |
143 Profile* profile_; | 149 Profile* profile_; |
144 StartupBrowserCreator* browser_creator_; | 150 StartupBrowserCreator* browser_creator_; |
145 bool is_first_run_; | 151 bool is_first_run_; |
146 DISALLOW_COPY_AND_ASSIGN(StartupBrowserCreatorImpl); | 152 DISALLOW_COPY_AND_ASSIGN(StartupBrowserCreatorImpl); |
147 }; | 153 }; |
148 | 154 |
149 // Returns true if |profile| has exited uncleanly and has not been launched | 155 // Returns true if |profile| has exited uncleanly and has not been launched |
150 // after the unclean exit. | 156 // after the unclean exit. |
151 bool HasPendingUncleanExit(Profile* profile); | 157 bool HasPendingUncleanExit(Profile* profile); |
152 | 158 |
153 #endif // CHROME_BROWSER_UI_STARTUP_STARTUP_BROWSER_CREATOR_IMPL_H_ | 159 #endif // CHROME_BROWSER_UI_STARTUP_STARTUP_BROWSER_CREATOR_IMPL_H_ |
OLD | NEW |