Refactor of BrowserDistribution.

chrome/installer/util/chrome_browser_operations.cc

 // Copyright (c) 2012 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/installer/util/chrome_browser_operations.h"
 
 #include "base/command_line.h"
 #include "base/file_util.h"
 #include "base/files/file_path.h"
 #include "base/logging.h"
@@ skipping 94 matching lines @@
 // - app_id: the browser model id for the current install.
 // - description: |dist|'s description.
 void ChromeBrowserOperations::AddDefaultShortcutProperties(
       BrowserDistribution* dist,
       const base::FilePath& target_exe,
       ShellUtil::ShortcutProperties* properties) const {
   if (!properties->has_target())
     properties->set_target(target_exe);
 
   if (!properties->has_icon()) {
-    int icon_index = dist->GetIconIndex();
+    int icon_index =
+        dist->GetIconIndex(BrowserDistribution::SHORTCUT_CHROME);
     base::FilePath prefs_path(target_exe.DirName().AppendASCII(
         installer::kDefaultMasterPrefs));
     if (base::PathExists(prefs_path)) {
       installer::MasterPreferences prefs(prefs_path);
       prefs.GetInt(installer::master_preferences::kChromeShortcutIconIndex,
                    &icon_index);
     }
     properties->set_icon(target_exe, icon_index);
   }
 
@@ skipping 12 matching lines @@
     const base::FilePath& setup_path,
     const std::set<string16>& options,
     InstallStatus status,
     bool system_level) const {
   CommandLine base_command(setup_path);
   AppendProductFlags(options, &base_command);
   installer::LaunchBrowserUserExperiment(base_command, status, system_level);
 }
 
 }  // namespace installer