summaryrefslogtreecommitdiffstats
path: root/chrome/installer/util/master_preferences.cc
diff options
context:
space:
mode:
authorkuchhal@chromium.org <kuchhal@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2008-11-22 00:36:46 +0000
committerkuchhal@chromium.org <kuchhal@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2008-11-22 00:36:46 +0000
commitf5eddaf87e378c29412a028e027f91d48fbab551 (patch)
tree071dbbc2730f28bfa414437c3eda73421754bf37 /chrome/installer/util/master_preferences.cc
parent84dee7fa8a7098e54f1dd12a028bc1ea9a76c99b (diff)
downloadchromium_src-f5eddaf87e378c29412a028e027f91d48fbab551.zip
chromium_src-f5eddaf87e378c29412a028e027f91d48fbab551.tar.gz
chromium_src-f5eddaf87e378c29412a028e027f91d48fbab551.tar.bz2
* Add support for verbose-logging option in master preferences file.
BUG=1497924 Review URL: http://codereview.chromium.org/11369 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@5879 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/installer/util/master_preferences.cc')
-rw-r--r--chrome/installer/util/master_preferences.cc5
1 files changed, 5 insertions, 0 deletions
diff --git a/chrome/installer/util/master_preferences.cc b/chrome/installer/util/master_preferences.cc
index 6d85d10..ee09b48 100644
--- a/chrome/installer/util/master_preferences.cc
+++ b/chrome/installer/util/master_preferences.cc
@@ -51,6 +51,8 @@ const wchar_t kDoNotLaunchChrome[] = L"distribution.do_not_launch_chrome";
const wchar_t kMakeChromeDefault[] = L"distribution.make_chrome_default";
// Install Chrome to system wise location.
const wchar_t kSystemLevel[] = L"distribution.system_level";
+// Run installer in verbose mode.
+const wchar_t kVerboseLogging[] = L"distribution.verbose_logging";
int ParseDistributionPreferences(const std::wstring& master_prefs_path) {
@@ -94,6 +96,9 @@ int ParseDistributionPreferences(const std::wstring& master_prefs_path) {
if (GetBooleanPref(json_root.get(), kSystemLevel))
parse_result |= MASTER_PROFILE_SYSTEM_LEVEL;
+ if (GetBooleanPref(json_root.get(), kVerboseLogging))
+ parse_result |= MASTER_PROFILE_VERBOSE_LOGGING;
+
return parse_result;
}