Merge r58176: Set default browser after import (OS Win)....

chrome/browser/first_run_win.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.h"
 
 #include <windows.h>
 #include <shellapi.h>
 #include <shlobj.h>
 
@@ skipping 342 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 36 matching lines @@
     // There is something to import from the default browser. This launches
     // the importer process and blocks until done or until it fails.
     scoped_refptr<ImporterHost> importer_host = new ImporterHost();
     if (!FirstRun::ImportSettings(NULL,
           importer_host->GetSourceProfileInfoAt(0).browser_type,
               out_prefs->do_import_items, import_bookmarks_path, true, NULL)) {
       LOG(WARNING) << "silent import failed";
     }
   }
 
+  if (installer_util::GetDistroBooleanPreference(prefs.get(),
+    installer_util::master_preferences::kMakeChromeDefaultForUser, &value) &&
+    value)
+    ShellIntegration::SetAsDefaultBrowser();
+
   return false;
 }
 
 bool Upgrade::IsBrowserAlreadyRunning() {
   static HANDLE handle = NULL;
   std::wstring exe;
   PathService::Get(base::FILE_EXE, &exe);
   std::replace(exe.begin(), exe.end(), '\\', '!');
   std::transform(exe.begin(), exe.end(), exe.begin(), tolower);
   exe = L"Global\\" + exe;
@@ skipping 191 matching lines @@
 }
 
 }  // namespace
 
 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) {
   FirstRun::CreateChromeDesktopShortcut();
   // Windows 7 has deprecated the quick launch bar.
   if (win_util::GetWinVersion() < win_util::WINVERSION_WIN7)
     CreateChromeQuickLaunchShortcut();
 
   scoped_refptr<ImporterHost> importer_host;
   importer_host = new ImporterHost();
   int items = 0;
 
@@ skipping 58 matching lines @@
         new FirstRunSearchEngineView(profile,
         randomize_search_engine_experiment));
     DCHECK(search_engine_dialog);
 
     search_engine_dialog->Show();
     views::AcceleratorHandler accelerator_handler;
     MessageLoopForUI::current()->Run(&accelerator_handler);
     search_engine_dialog->Close();
   }
 
+  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();
 }
 
 bool FirstRun::ImportSettings(Profile* profile, int browser_type,
@@ skipping 384 matching lines @@
 
 Upgrade::TryResult Upgrade::ShowTryChromeDialog(size_t version) {
   if (version > 10000) {
     // This is a test value. We want to make sure we exercise
     // returning this early. See EarlyReturnTest test harness.
     return Upgrade::TD_NOT_NOW;
   }
   TryChromeDialog td;
   return td.ShowModal();
 }