| 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_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 230 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 241 // Shows a sync promo dialog if necessary. When called |browser| should be | 241 // Shows a sync promo dialog if necessary. When called |browser| should be |
| 242 // the browser that's being used for startup. On return |browser| is set | 242 // the browser that's being used for startup. On return |browser| is set |
| 243 // to the browser spawned from the sync promo dialog (if any). On input | 243 // to the browser spawned from the sync promo dialog (if any). On input |
| 244 // |tabs| should be the set of tabs to show on startup. On return |tabs| | 244 // |tabs| should be the set of tabs to show on startup. On return |tabs| |
| 245 // will contain the new set of tabs to show on startup. Returns the index | 245 // will contain the new set of tabs to show on startup. Returns the index |
| 246 // of the tab to activate. | 246 // of the tab to activate. |
| 247 size_t ShowSyncPromoDialog(bool process_startup, | 247 size_t ShowSyncPromoDialog(bool process_startup, |
| 248 Browser** browser, | 248 Browser** browser, |
| 249 std::vector<Tab>* tabs); | 249 std::vector<Tab>* tabs); |
| 250 | 250 |
| 251 // Checks whether the Preferences backup is invalid and notifies user in |
| 252 // that case. |
| 253 void CheckPreferencesBackup(Profile* profile); |
| 254 |
| 251 const FilePath cur_dir_; | 255 const FilePath cur_dir_; |
| 252 const CommandLine& command_line_; | 256 const CommandLine& command_line_; |
| 253 Profile* profile_; | 257 Profile* profile_; |
| 254 BrowserInit* browser_init_; | 258 BrowserInit* browser_init_; |
| 255 bool is_first_run_; | 259 bool is_first_run_; |
| 256 DISALLOW_COPY_AND_ASSIGN(LaunchWithProfile); | 260 DISALLOW_COPY_AND_ASSIGN(LaunchWithProfile); |
| 257 }; | 261 }; |
| 258 | 262 |
| 259 private: | 263 private: |
| 260 friend class CloudPrintProxyPolicyTest; | 264 friend class CloudPrintProxyPolicyTest; |
| (...skipping 30 matching lines...) Expand all Loading... |
| 291 | 295 |
| 292 // True if we have already read and reset the preference kWasRestarted. (A | 296 // True if we have already read and reset the preference kWasRestarted. (A |
| 293 // member variable instead of a static variable inside WasRestarted because | 297 // member variable instead of a static variable inside WasRestarted because |
| 294 // of testing.) | 298 // of testing.) |
| 295 static bool was_restarted_read_; | 299 static bool was_restarted_read_; |
| 296 | 300 |
| 297 DISALLOW_COPY_AND_ASSIGN(BrowserInit); | 301 DISALLOW_COPY_AND_ASSIGN(BrowserInit); |
| 298 }; | 302 }; |
| 299 | 303 |
| 300 #endif // CHROME_BROWSER_UI_BROWSER_INIT_H_ | 304 #endif // CHROME_BROWSER_UI_BROWSER_INIT_H_ |
| OLD | NEW |