Linux: Add "set chrome as default" and "import profile data" option to First Run UI. Also enable it for Chromium builds.

Review URL: http://codereview.chromium.org/149348

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@20212 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 1 insertions, 31 deletions

diff --git a/chrome/browser/browser_main.cc b/chrome/browser/browser_main.cc
index a6df834..403efc9 100644
--- a/chrome/browser/browser_main.cc
+++ b/chrome/browser/browser_main.cc
@@ -386,30 +386,6 @@ int BrowserMain(const MainFunctionParams& parameters) {
 #endif
 
 
-#if defined(OS_POSIX)
-  // On Mac OS X / Linux we display the first run dialog as early as possible,
-  // so we can get the stats enabled.
-  // TODO(port):
-  // We check the kNoFirstRun command line switch explicitly here since the
-  // early placement of this block happens before that's factored into
-  // first_run_ui_bypass, we probably want to move that block up
-  // and remove the explicit check from here in the long run.
-  if (is_first_run && !first_run_ui_bypass &&
-      !parsed_command_line.HasSwitch(switches::kNoFirstRun)) {
-    // Dummy value, we don't need the profile for the OS X version of this
-    // method at present.
-    Profile* profile = NULL;
-    OpenFirstRunDialog(profile, &process_singleton);
-
-#if defined(GOOGLE_CHROME_BUILD)
-    // If user cancelled the first run dialog box, the first run sentinel file
-    // didn't get created and we should exit Chrome.
-    if (FirstRun::IsChromeFirstRun())
-      return ResultCodes::NORMAL_EXIT;
-#endif
-  }
-#endif  // OS_POSIX
-
   // During first run we read the google_update registry key to find what
   // language the user selected when downloading the installer. This
   // becomes our default language in the prefs.
@@ -612,12 +588,6 @@ int BrowserMain(const MainFunctionParams& parameters) {
 
   process_singleton.Create();
 
-  // TODO(port): This block of code should probably be used on all platforms!
-  // On Mac OS X / Linux we display this dialog before setting the value of
-  // kMetricsReportingEnabled, so we display this dialog much earlier.
-  // On Windows a download is tagged with stats enabled/disabled so the UI
-  // can be displayed later in the startup process.
-#if !defined(OS_POSIX)
   // Show the First Run UI if this is the first time Chrome has been run on
   // this computer, or we're being compelled to do so by a command line flag.
   // Note that this be done _after_ the PrefService is initialized and all
@@ -626,10 +596,10 @@ int BrowserMain(const MainFunctionParams& parameters) {
   if (is_first_run && !first_run_ui_bypass) {
     if (!OpenFirstRunDialog(profile, &process_singleton)) {
       // The user cancelled the first run dialog box, we should exit Chrome.
+
       return ResultCodes::NORMAL_EXIT;
     }
   }
-#endif  // OS_POSIX
 
   // Sets things up so that if we crash from this point on, a dialog will
   // popup asking the user to restart chrome. It is done this late to avoid