Merge 22314 - Use alternate icon for Chrome shortcuts if specified in master ...

chrome/installer/util/master_preferences.h

 // 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.
 //
 // This file contains functions processing master preference file used by
 // setup and first run.
 
 #ifndef CHROME_INSTALLER_UTIL_MASTER_PREFERENCES_H_
 #define CHROME_INSTALLER_UTIL_MASTER_PREFERENCES_H_
 
 #include "base/file_path.h"
 #include "base/values.h"
 
 namespace installer_util {
 
 namespace master_preferences {
 // All the preferences below are expected to be inside the JSON "distribution"
 // block. Some of them also have equivalent command line option. If same option
 // is specified in master preference as well as command line, the commnd line
 // value takes precedence.
 
 // Boolean. Use alternate text for the shortcut. Cmd line override present.
 extern const wchar_t kAltShortcutText[];
 // Boolean. Use alternate smaller first run info bubble.
 extern const wchar_t kAltFirstRunBubble[];
+// Integer. Icon index from chrome.exe to use for shortcuts.
+extern const wchar_t kChromeShortcutIconIndex[];
 // Boolean. Create Desktop and QuickLaunch shortcuts. Cmd line override present.
 extern const wchar_t kCreateAllShortcuts[];
 // Boolean pref that triggers silent import of the default browser bookmarks.
 extern const wchar_t kDistroImportBookmarksPref[];
 // Boolean pref that triggers silent import of the default browser history.
 extern const wchar_t kDistroImportHistoryPref[];
 // Boolean pref that triggers silent import of the default browser homepage.
 extern const wchar_t kDistroImportHomePagePref[];
 // Boolean pref that triggers silent import of the default search engine.
 extern const wchar_t kDistroImportSearchPref[];
@@ skipping 21 matching lines @@
 // values in the user profile at first run.
 const wchar_t kDefaultMasterPrefs[] = L"master_preferences";
 
 // Gets the value of given boolean preference |name| from |prefs| dictionary
 // which is assumed to contain a dictionary named "distribution".
 bool GetDistroBooleanPreference(const DictionaryValue* prefs,
                                 const std::wstring& name);
 
 // This function gets ping delay (ping_delay in the sample above) from master
 // preferences.
-bool GetDistributionPingDelay(const DictionaryValue* prefs,
-                              int* ping_delay);
+bool GetDistroIntegerPreference(const DictionaryValue* prefs,
+                                const std::wstring& name,
+                                int* value);
 
 // The master preferences is a JSON file with the same entries as the
 // 'Default\Preferences' file. This function parses the distribution
 // section of the preferences file.
 //
 // A prototypical 'master_preferences' file looks like this:
 //
 // {
 //   "distribution": {
 //      "alternate_shortcut_text": false,
 //      "oem_bubble": false,
+//      "chrome_shortcut_icon_index": 0,
 //      "create_all_shortcuts": true,
 //      "import_bookmarks": false,
 //      "import_history": false,
 //      "import_home_page": false,
 //      "import_search_engine": true,
 //      "ping_delay": 40,
 //      "show_welcome_page": true,
 //      "skip_first_run_ui": true,
 //      "do_not_launch_chrome": false,
 //      "make_chrome_default": false,
@@ skipping 40 matching lines @@
 std::vector<std::wstring> GetFirstRunTabs(const DictionaryValue* prefs);
 
 // Sets the value of given boolean preference |name| in "distribution"
 // dictionary inside |prefs| dictionary.
 bool SetDistroBooleanPreference(DictionaryValue* prefs,
                                 const std::wstring& name,
                                 bool value);
 }
 
 #endif  // CHROME_INSTALLER_UTIL_MASTER_PREFERENCES_H_