Chromium Code Reviews| Index: chrome/browser/first_run/first_run_internal.h |
| diff --git a/chrome/browser/first_run/first_run_internal.h b/chrome/browser/first_run/first_run_internal.h |
| index 01187cca89760c8eccc9d98082eb0913fa4e6547..5d90c5cc0525b47ce3f2c04bc0e87df657feb508 100644 |
| --- a/chrome/browser/first_run/first_run_internal.h |
| +++ b/chrome/browser/first_run/first_run_internal.h |
| @@ -30,8 +30,14 @@ class MasterPreferences; |
| } |
| namespace first_run { |
| + |
| namespace internal { |
| +// Flags indicating whether a first-run profile auto import was performed, and |
| +// whether the importer process exited successfully. |
| +extern bool g_did_perform_profile_import; |
|
gab
2013/03/26 15:55:25
Moved from first_run.cc (to allow them to be set f
|
| +extern bool g_profile_import_exited_successfully; |
| + |
| enum FirstRunState { |
| FIRST_RUN_UNKNOWN, // The state is not tested or set yet. |
| FIRST_RUN_TRUE, |
| @@ -64,9 +70,15 @@ void SetDefaultBrowser(installer::MasterPreferences* install_prefs); |
| // not found or specified, it returns false by default. |
| bool SkipFirstRunUI(installer::MasterPreferences* install_prefs); |
| -// Sets ping_delay. |
| -void SetRLZPref(first_run::MasterPrefs* out_prefs, |
| - installer::MasterPreferences* install_prefs); |
| +// Imports settings. This may be done in a separate process depending on the |
| +// platform, but it will always block until done. The return value indicates |
| +// success. |
| +// This functions has a common implementation for OS_POSIX, and a |
| +// windows specific implementation. |
| +bool ImportSettings(Profile* profile, |
| + scoped_refptr<ImporterHost> importer_host, |
| + scoped_refptr<ImporterList> importer_list, |
| + int items_to_import); |
| // -- Platform-specific functions -- |
| @@ -81,21 +93,6 @@ bool GetFirstRunSentinelFilePath(base::FilePath* path); |
| // a linux specific implementation. |
| bool IsOrganicFirstRun(); |
| -// Imports settings. This may be done in a separate process depending on the |
| -// platform, but it will always block until done. The return value indicates |
| -// success. |
| -// This functions has a common implementation for OS_POSIX, and a |
| -// windows specific implementation. |
| -bool ImportSettings(Profile* profile, |
| - scoped_refptr<ImporterHost> importer_host, |
| - scoped_refptr<ImporterList> importer_list, |
| - int items_to_import); |
| - |
| -// Sets import preferences and launch the import process. |
| -void SetImportPreferencesAndLaunchImport( |
| - MasterPrefs* out_prefs, |
| - installer::MasterPreferences* install_prefs); |
| - |
| int ImportBookmarkFromFileIfNeeded(Profile* profile, |
| const CommandLine& cmdline); |