Allow download Chrome page to set Chrome as default even if it is not a new i...

chrome/installer/setup/install.cc

 // Copyright (c) 2009 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 <shlobj.h>
 #include <time.h>
 
 #include "chrome/installer/setup/install.h"
 
 #include "base/command_line.h"
@@ skipping 755 matching lines @@
       if (!CreateOrUpdateChromeShortcuts(exe_path, install_path,
                                          new_version.GetString(), result,
                                          system_install, create_all_shortcut,
                                          alt_shortcut))
         LOG(WARNING) << "Failed to create/update start menu shortcut.";
 
       bool make_chrome_default = false;
       installer_util::GetDistroBooleanPreference(prefs,
           installer_util::master_preferences::kMakeChromeDefault,
           &make_chrome_default);
+
+      // If this is not the user's first Chrome install, but they have chosen
+      // Chrome to become their default browser on the download page, we must
+      // force it here because the master_preferences file will not get copied
+      // into the build.
+      bool force_chrome_default_for_user = false;
+      if (result == installer_util::NEW_VERSION_UPDATED ||
+          result == installer_util::IN_USE_UPDATED ||

[huanr, 2010/09/02 02:30:12]

Did you update the CL? I still see IN_USE_UPDATED.

Other than that, lgtm

+          result == installer_util::INSTALL_REPAIRED) {
+        installer_util::GetDistroBooleanPreference(prefs,
+            installer_util::master_preferences::kMakeChromeDefaultForUser,
+            &force_chrome_default_for_user);
+      }
+
       RegisterChromeOnMachine(install_path, system_install,
-                              make_chrome_default);
+          make_chrome_default || force_chrome_default_for_user);
     }
 
     std::wstring latest_version_to_keep(new_version.GetString());
     if (!current_version.empty())
       latest_version_to_keep.assign(current_version);
     RemoveOldVersionDirs(install_path, latest_version_to_keep);
   }
 
   return result;
 }