cleanup

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

1 files changed, 43 insertions, 43 deletions

diff --git a/chrome/installer/util/master_preferences.h b/chrome/installer/util/master_preferences.h
index 103605a..44d099c 100644
--- a/chrome/installer/util/master_preferences.h
+++ b/chrome/installer/util/master_preferences.h
@@ -15,53 +15,52 @@ namespace installer_util {
 
 namespace master_preferences {
 // All the preferences below are expected to be inside the JSON "distribution"
-// block.
+// 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 pref that triggers skipping the first run dialogs.
-extern const wchar_t kDistroSkipFirstRunPref[];
-// Boolean pref that triggers loading the welcome page.
-extern const wchar_t kDistroShowWelcomePage[];
-// Boolean pref that triggers silent import of the default search engine.
-extern const wchar_t kDistroImportSearchPref[];
-// Boolean pref that triggers silent import of the default browser history.
-extern const wchar_t kDistroImportHistoryPref[];
+// 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[];
+// 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[];
-// RLZ ping delay in seconds
+// 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[];
+// Integer. RLZ ping delay in seconds.
 extern const wchar_t kDistroPingDelay[];
-// Register Chrome as default browser for the current user.
-extern const wchar_t kMakeChromeDefaultForUser[];
-// The following boolean prefs have the same semantics as the corresponding
-// setup command line switches. See chrome/installer/util/util_constants.cc
-// for more info.
-// Create Desktop and QuickLaunch shortcuts.
-extern const wchar_t kCreateAllShortcuts[];
-// Prevent installer from launching Chrome after a successful first install.
+// Boolean pref that triggers loading the welcome page.
+extern const wchar_t kDistroShowWelcomePage[];
+// Boolean pref that triggers skipping the first run dialogs.
+extern const wchar_t kDistroSkipFirstRunPref[];
+// Boolean. Do not launch Chrome after first install. Cmd line override present.
 extern const wchar_t kDoNotLaunchChrome[];
-// Register Chrome as default browser on the system.
+// Boolean. Register Chrome as default browser. Cmd line override present.
 extern const wchar_t kMakeChromeDefault[];
-// Install Chrome to system wise location.
+// Boolean. Register Chrome as default browser for the current user.
+extern const wchar_t kMakeChromeDefaultForUser[];
+// Boolean but only meant to be used for internal purposes.
+extern const wchar_t kMasterPreferencesValid[];
+// Boolean. Show EULA dialog before install.
+extern const wchar_t kRequireEula[];
+// Boolean. Install Chrome to system wise location. Cmd line override present.
 extern const wchar_t kSystemLevel[];
-// Run installer in verbose mode.
+// Boolean. Run installer in verbose mode. Cmd line override present.
 extern const wchar_t kVerboseLogging[];
-// Show EULA dialog and install only if accepted.
-extern const wchar_t kRequireEula[];
-// Use alternate shortcut text for the main shortcut.
-extern const wchar_t kAltShortcutText[];
-// Use alternate smaller first run info bubble.
-extern const wchar_t kAltFirstRunBubble[];
-// Boolean pref that triggers silent import of the default browser homepage.
-extern const wchar_t kDistroImportHomePagePref[];
-
-extern const wchar_t kMasterPreferencesValid[];
 }
 
 // This is the default name for the master preferences file used to pre-set
 // values in the user profile at first run.
 const wchar_t kDefaultMasterPrefs[] = L"master_preferences";
 
-bool GetBooleanPreference(const DictionaryValue* prefs,

-                          const std::wstring& name);

+bool GetDistroBooleanPreference(const DictionaryValue* prefs,

+                                const std::wstring& name);

 
 // This function gets ping delay (ping_delay in the sample above) from master
 // preferences.
@@ -76,21 +75,22 @@ bool GetDistributionPingDelay(const DictionaryValue* prefs,
 //
 // {
 //   "distribution": {
-//      "skip_first_run_ui": true,
-//      "show_welcome_page": true,
-//      "import_search_engine": true,
-//      "import_history": false,
+//      "alternate_shortcut_text": false,
+//      "oem_bubble": false,
+//      "create_all_shortcuts": true,
 //      "import_bookmarks": false,
+//      "import_history": false,
 //      "import_home_page": false,
-//      "create_all_shortcuts": true,
+//      "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,
 //      "make_chrome_default_for_user": true,
-//      "system_level": false,
-//      "verbose_logging": true,
 //      "require_eula": true,
-//      "alternate_shortcut_text": false,
-//      "ping_delay": 40
+//      "system_level": false,
+//      "verbose_logging": true
 //   },
 //   "browser": {
 //      "show_home_button": true
@@ -127,7 +127,7 @@ DictionaryValue* ParseDistributionPreferences(
 //
 // This function retuns the list as a vector of strings. If the master
 // preferences file does not contain such list the vector is empty.
-std::vector<std::wstring> ParseFirstRunTabs(const DictionaryValue* prefs);
+std::vector<std::wstring> GetFirstRunTabs(const DictionaryValue* prefs);
 }
 
 #endif  // CHROME_INSTALLER_UTIL_MASTER_PREFERENCES_H_