diff options
| author | estade@chromium.org <estade@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-08-25 23:41:45 +0000 |
|---|---|---|
| committer | estade@chromium.org <estade@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-08-25 23:41:45 +0000 |
| commit | 8c47d69ca531d30e0ab82377420e5525424b86ce (patch) | |
| tree | 6a6427b8605c353420342fa20e6b03a788c2f70b /chrome/browser/browser_main.cc | |
| parent | c0e11ab531aae20470289475d69ac507d9715262 (diff) | |
| download | chromium_src-8c47d69ca531d30e0ab82377420e5525424b86ce.zip chromium_src-8c47d69ca531d30e0ab82377420e5525424b86ce.tar.gz chromium_src-8c47d69ca531d30e0ab82377420e5525424b86ce.tar.bz2 | |
Refactor new first run control flow.
Factor out the common code so that Mac and Linux may share the new flow with Windows (e.g., import is done before the first run dialog appears).
Windows *should* be unaffected by this change. Linux has some non-user-visible changes. The user visible changes (showing the default search engine in the ballot, for example) are TODO.
BUG=49705,47651
TEST=launching chromium with --first-run works as expected, i.e. it imports stuff from your default browser (such as history); if that browser is firefox and firefox is open, the failure is silent.
Review URL: http://codereview.chromium.org/3171029
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@57421 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/browser_main.cc')
| -rw-r--r-- | chrome/browser/browser_main.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/chrome/browser/browser_main.cc b/chrome/browser/browser_main.cc index fcafef0..7bda668 100644 --- a/chrome/browser/browser_main.cc +++ b/chrome/browser/browser_main.cc @@ -1236,7 +1236,7 @@ int BrowserMain(const MainFunctionParams& parameters) { // touches reads preferences. if (is_first_run) { if (!first_run_ui_bypass) { -#if defined(OS_WIN) +#if defined(OS_WIN) || defined(OS_LINUX) FirstRun::AutoImport(profile, master_prefs.homepage_defined, master_prefs.do_import_items, |