Use alternate icon for Chrome shortcuts if specified in master preferences.

This change depends on change 159539 that is currently under review and a new chrome2.ico that is yet to be added to the repository.

BUG=12701
TEST=Specify an alternate icon in --installerdata file and make sure that icon is used for shortcuts and it not changed later by updates.

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

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

3 files changed, 24 insertions, 22 deletions

diff --git a/chrome/installer/setup/install.cc b/chrome/installer/setup/install.cc
index ba62f0c..6b20d68 100644
--- a/chrome/installer/setup/install.cc
+++ b/chrome/installer/setup/install.cc
@@ -142,6 +142,19 @@ void AddUninstallShortcutWorkItems(HKEY reg_root,
   }
 }
 
+// Copy master preferences file provided to installer, in the same folder
+// as chrome.exe so Chrome first run can find it. This function will be called
+// only on the first install of Chrome.
+void CopyPreferenceFileForFirstRun(bool system_level,
+                                   const std::wstring& prefs_source_path) {
+  std::wstring prefs_dest_path(
+      installer::GetChromeInstallPath(system_level));
+  file_util::AppendToPath(&prefs_dest_path,
+                          installer_util::kDefaultMasterPrefs);
+  if (!file_util::CopyFile(prefs_source_path, prefs_dest_path))
+    LOG(ERROR) << "failed copying master profile";
+}
+
 // This method creates Chrome shortcuts in Start->Programs for all users or
 // only for current user depending on whether it is system wide install or
 // user only install.
@@ -480,8 +493,9 @@ bool installer::InstallNewVersion(const std::wstring& exe_path,
 
 installer_util::InstallStatus installer::InstallOrUpdateChrome(
     const std::wstring& exe_path, const std::wstring& archive_path,
-    const std::wstring& install_temp_path, const DictionaryValue* prefs,
-    const Version& new_version, const Version* installed_version) {
+    const std::wstring& install_temp_path, const std::wstring& prefs_path,
+    const DictionaryValue* prefs, const Version& new_version,
+    const Version* installed_version) {
   bool system_install = installer_util::GetDistroBooleanPreference(prefs,
       installer_util::master_preferences::kSystemLevel);
   std::wstring install_path(GetChromeInstallPath(system_install));
@@ -508,6 +522,7 @@ installer_util::InstallStatus installer::InstallOrUpdateChrome(
     if (!installed_version) {
       LOG(INFO) << "First install of version " << new_version.GetString();
       result = installer_util::FIRST_INSTALL_SUCCESS;
+      CopyPreferenceFileForFirstRun(system_install, prefs_path);
     } else if (new_version.GetString() == installed_version->GetString()) {
       LOG(INFO) << "Install repaired of version " << new_version.GetString();
       result = installer_util::INSTALL_REPAIRED;
diff --git a/chrome/installer/setup/install.h b/chrome/installer/setup/install.h
index de468b3..cd77a3a 100644
--- a/chrome/installer/setup/install.h
+++ b/chrome/installer/setup/install.h
@@ -37,8 +37,9 @@ std::wstring GetInstallerPathUnderChrome(const std::wstring& install_path,
 // is responsible for cleaning up install_temp_path.
 installer_util::InstallStatus InstallOrUpdateChrome(
     const std::wstring& exe_path, const std::wstring& archive_path,
-    const std::wstring& install_temp_path, const DictionaryValue* prefs,
-    const Version& new_version, const Version* installed_version);
+    const std::wstring& install_temp_path, const std::wstring& prefs_path,
+    const DictionaryValue* prefs, const Version& new_version,
+    const Version* installed_version);
 
 // This function installs a new version of Chrome to the specified location.
 // It returns true if install was successful and false in case of an error.
diff --git a/chrome/installer/setup/setup_main.cc b/chrome/installer/setup/setup_main.cc
index eb2e8ba..3c314ff 100644
--- a/chrome/installer/setup/setup_main.cc
+++ b/chrome/installer/setup/setup_main.cc
@@ -245,21 +245,6 @@ DictionaryValue* GetInstallPreferences(const CommandLine& cmd_line) {
   return prefs;
 }
 
-// Copy master preferences file provided to installer, in the same folder
-// as chrome.exe so Chrome first run can find it. This function will be called
-// only on the first install of Chrome.
-void CopyPreferenceFileForFirstRun(bool system_level,
-                                   const CommandLine& cmd_line) {
-  std::wstring prefs_source_path = cmd_line.GetSwitchValue(
-      installer_util::switches::kInstallerData);
-  std::wstring prefs_dest_path(
-      installer::GetChromeInstallPath(system_level));
-  file_util::AppendToPath(&prefs_dest_path,
-                          installer_util::kDefaultMasterPrefs);
-  if (!file_util::CopyFile(prefs_source_path, prefs_dest_path))
-    LOG(ERROR) << "failed copying master profile";
-}
-
 bool CheckPreInstallConditions(const installer::Version* installed_version,
                                bool system_install,
                                installer_util::InstallStatus& status) {
@@ -369,9 +354,11 @@ installer_util::InstallStatus InstallChrome(const CommandLine& cmd_line,
         std::wstring archive_to_copy(temp_path);
         file_util::AppendToPath(&archive_to_copy,
                                 std::wstring(installer::kChromeArchive));
+        std::wstring prefs_source_path = cmd_line.GetSwitchValue(
+            installer_util::switches::kInstallerData);
         install_status = installer::InstallOrUpdateChrome(
-            cmd_line.program(), archive_to_copy, temp_path, prefs,
-            *installer_version, installed_version);
+            cmd_line.program(), archive_to_copy, temp_path, prefs_source_path,
+            prefs, *installer_version, installed_version);
 
         int install_msg_base = IDS_INSTALL_FAILED_BASE;
         std::wstring chrome_exe;
@@ -392,7 +379,6 @@ installer_util::InstallStatus InstallChrome(const CommandLine& cmd_line,
                                           install_msg_base, &chrome_exe);
         if (install_status == installer_util::FIRST_INSTALL_SUCCESS) {
           LOG(INFO) << "First install successful.";
-          CopyPreferenceFileForFirstRun(system_level, cmd_line);
           // We never want to launch Chrome in system level install mode.
           if (!system_level && !installer_util::GetDistroBooleanPreference(prefs,
               installer_util::master_preferences::kDoNotLaunchChrome))