Set default browser AFTER import....

chrome/browser/first_run/first_run.cc

 // Copyright (c) 2010 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/first_run/first_run.h"
 
 #include "build/build_config.h"
 
 // TODO(port): move more code in back from the first_run_win.cc module.
 
@@ skipping 188 matching lines @@
   // Bookmarks are never imported unless specifically turned on.
   if (installer_util::GetDistroBooleanPreference(prefs.get(),
       installer_util::master_preferences::kDistroImportBookmarksPref, &value)
       && value) {
     out_prefs->do_import_items |= importer::FAVORITES;
   }
 
   if (installer_util::GetDistroBooleanPreference(prefs.get(),
       installer_util::master_preferences::kMakeChromeDefaultForUser, &value) &&
       value)
-    ShellIntegration::SetAsDefaultBrowser();
+    out_prefs->make_chrome_default = true;
 
   // TODO(mirandac): Refactor skip-first-run-ui process into regular first run
   // import process.  http://crbug.com/49647
   // Note we are skipping all other master preferences if skip-first-run-ui
   // is *not* specified. (That is, we continue only if skipping first run ui.)
   if (!installer_util::GetDistroBooleanPreference(prefs.get(),
       installer_util::master_preferences::kDistroSkipFirstRunPref, &value) ||
       !value)
     return true;
 
@@ skipping 55 matching lines @@
   if (!import_bookmarks_path.empty()) {
     // There are bookmarks to import from a file.
     FilePath path = FilePath::FromWStringHack(UTF8ToWide(
         import_bookmarks_path));
     if (!FirstRun::ImportBookmarks(path)) {
       LOG(WARNING) << "silent bookmark import failed";
     }
   }
 #endif
 
+  if (installer_util::GetDistroBooleanPreference(prefs.get(),
+      installer_util::master_preferences::kMakeChromeDefaultForUser, &value) &&
+      value)
+    ShellIntegration::SetAsDefaultBrowser();
+
   return false;
 }
 
 // static
 bool FirstRun::IsChromeFirstRun() {
   if (first_run_ != FIRST_RUN_UNKNOWN)
     return first_run_ == FIRST_RUN_TRUE;
 
   FilePath first_run_sentinel;
   if (!GetFirstRunSentinelFilePath(&first_run_sentinel) ||
@@ skipping 164 matching lines @@
 // TODO(avi): port the relevant pieces and enable this.
 #if !defined(OS_MACOSX)
 // static
 void FirstRun::AutoImport(
     Profile* profile,
     bool homepage_defined,
     int import_items,
     int dont_import_items,
     bool search_engine_experiment,
     bool randomize_search_engine_experiment,
+    bool make_chrome_default,
     ProcessSingleton* process_singleton) {
   // We need to avoid dispatching new tabs when we are importing because
   // that will lead to data corruption or a crash. Because there is no UI for
   // the import process, we pass NULL as the window to bring to the foreground
   // when a CopyData message comes in; this causes the message to be silently
   // discarded, which is the correct behavior during the import process.
   process_singleton->Lock(NULL);
 
   PlatformSetup();
 
@@ skipping 43 matching lines @@
   bool local_state_file_exists = file_util::PathExists(local_state_path);
 
   if (IsOrganic() && !local_state_file_exists) {
     // The home page string may be set in the preferences, but the user should
     // initially use Chrome with the NTP as home page in organic builds.
     profile->GetPrefs()->SetBoolean(prefs::kHomePageIsNewTabPage, true);
 
     ShowFirstRunDialog(profile, randomize_search_engine_experiment);
   }
 
+  if (make_chrome_default)
+    ShellIntegration::SetAsDefaultBrowser();
+
   FirstRun::SetShowFirstRunBubblePref(true);
   // Set the first run bubble to minimal.
   FirstRun::SetMinimalFirstRunBubblePref();
   FirstRun::SetShowWelcomePagePref();
 
   process_singleton->Unlock();
   FirstRun::CreateSentinel();
 }
 #endif  // !defined(OS_MACOSX)