diff options
| author | kuchhal@chromium.org <kuchhal@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-10-28 20:12:08 +0000 |
|---|---|---|
| committer | kuchhal@chromium.org <kuchhal@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-10-28 20:12:08 +0000 |
| commit | 7da7f343ce147cb2fd628fa0dd3ab7cd281efc06 (patch) | |
| tree | a755766ebd897c03284bf3c14bdff3eb5e76f4a4 /chrome/browser/browser_main.cc | |
| parent | 21674df8085ee01ca91bbd4fe41ee1ea240a0cda (diff) | |
| download | chromium_src-7da7f343ce147cb2fd628fa0dd3ab7cd281efc06.zip chromium_src-7da7f343ce147cb2fd628fa0dd3ab7cd281efc06.tar.gz chromium_src-7da7f343ce147cb2fd628fa0dd3ab7cd281efc06.tar.bz2 | |
Cleanup a few FirstRun methods that are only applicable to Windows.
BUG=11971
TEST=No functional change. Make sure first-run/import still works on all three platforms.
Review URL: http://codereview.chromium.org/340020
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@30379 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/browser_main.cc')
| -rw-r--r-- | chrome/browser/browser_main.cc | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/chrome/browser/browser_main.cc b/chrome/browser/browser_main.cc index c559f70..5ae1806 100644 --- a/chrome/browser/browser_main.cc +++ b/chrome/browser/browser_main.cc @@ -349,7 +349,6 @@ int BrowserMain(const MainFunctionParams& parameters) { bool is_first_run = FirstRun::IsChromeFirstRun() || parsed_command_line.HasSwitch(switches::kFirstRun); - bool first_run_ui_bypass = false; scoped_ptr<BrowserProcess> browser_process; if (parsed_command_line.HasSwitch(switches::kImport)) { @@ -490,11 +489,15 @@ int BrowserMain(const MainFunctionParams& parameters) { BrowserInit browser_init; +#if defined(OS_WIN) int rlz_ping_delay = 0; +#endif bool homepage_defined = false; int import_items = 0; int dont_import_items = 0; + bool first_run_ui_bypass = false; if (is_first_run) { +#if defined(OS_WIN) // On first run, we need to process the master preferences before the // browser's profile_manager object is created, but after ResourceBundle // is initialized. @@ -505,6 +508,7 @@ int BrowserMain(const MainFunctionParams& parameters) { // The master prefs might specify a set of urls to display. if (first_run_tabs.size()) AddFirstRunNewTabs(&browser_init, first_run_tabs); +#endif // OS_WIN // If we are running in App mode, we do not want to show the importer // (first run) UI. @@ -637,8 +641,10 @@ int BrowserMain(const MainFunctionParams& parameters) { // Importing other browser settings is done in a browser-like process // that exits when this task has finished. +#if defined(OS_WIN) if (parsed_command_line.HasSwitch(switches::kImport)) return FirstRun::ImportNow(profile, parsed_command_line); +#endif // When another process is running, use it instead of starting us. switch (process_singleton.NotifyOtherProcess()) { |