diff options
| author | joaodasilva@chromium.org <joaodasilva@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-12-01 13:14:50 +0000 |
|---|---|---|
| committer | joaodasilva@chromium.org <joaodasilva@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-12-01 13:14:50 +0000 |
| commit | 6fd9df6e95ede5d08f70bade7bc36767739865d5 (patch) | |
| tree | 7ac69d3bf44d7e02572bad29650829564add1076 /chrome/app | |
| parent | 3fc40c14495f094dbb47ae4237e8d013304de0f4 (diff) | |
| download | chromium_src-6fd9df6e95ede5d08f70bade7bc36767739865d5.zip chromium_src-6fd9df6e95ede5d08f70bade7bc36767739865d5.tar.gz chromium_src-6fd9df6e95ede5d08f70bade7bc36767739865d5.tar.bz2 | |
Added recommended pref store on Windows.
BUG=49941
TEST=Set policies for Chromium/Chrome in a registry subkey named "Recommended". Those policies become the default values and can be overridden by the user.
Review URL: http://codereview.chromium.org/8551010
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@112456 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/app')
| -rw-r--r-- | chrome/app/breakpad_win.cc | 13 | ||||
| -rw-r--r-- | chrome/app/chrome_main_delegate.cc | 6 |
2 files changed, 10 insertions, 9 deletions
diff --git a/chrome/app/breakpad_win.cc b/chrome/app/breakpad_win.cc index 58a9d27..57f9d6f 100644 --- a/chrome/app/breakpad_win.cc +++ b/chrome/app/breakpad_win.cc @@ -564,17 +564,16 @@ extern "C" int __declspec(dllexport) CrashForException( static bool MetricsReportingControlledByPolicy(bool* result) { std::wstring key_name = UTF8ToWide(policy::key::kMetricsReportingEnabled); DWORD value = 0; - // TODO(joshia): why hkcu_policy_key opens HKEY_LOCAL_MACHINE? - base::win::RegKey hkcu_policy_key(HKEY_LOCAL_MACHINE, - policy::kRegistrySubKey, KEY_READ); - if (hkcu_policy_key.ReadValueDW(key_name.c_str(), &value) == ERROR_SUCCESS) { + base::win::RegKey hklm_policy_key(HKEY_LOCAL_MACHINE, + policy::kRegistryMandatorySubKey, KEY_READ); + if (hklm_policy_key.ReadValueDW(key_name.c_str(), &value) == ERROR_SUCCESS) { *result = value != 0; return true; } - base::win::RegKey hklm_policy_key(HKEY_CURRENT_USER, - policy::kRegistrySubKey, KEY_READ); - if (hklm_policy_key.ReadValueDW(key_name.c_str(), &value) == ERROR_SUCCESS) { + base::win::RegKey hkcu_policy_key(HKEY_CURRENT_USER, + policy::kRegistryMandatorySubKey, KEY_READ); + if (hkcu_policy_key.ReadValueDW(key_name.c_str(), &value) == ERROR_SUCCESS) { *result = value != 0; return true; } diff --git a/chrome/app/chrome_main_delegate.cc b/chrome/app/chrome_main_delegate.cc index 257f354..5c96e27 100644 --- a/chrome/app/chrome_main_delegate.cc +++ b/chrome/app/chrome_main_delegate.cc @@ -139,8 +139,10 @@ bool LoadUserDataDirPolicyFromRegistry(HKEY hive, FilePath* user_data_dir) { std::wstring value; - base::win::RegKey hklm_policy_key(hive, policy::kRegistrySubKey, KEY_READ); - if (hklm_policy_key.ReadValue(key_name.c_str(), &value) == ERROR_SUCCESS) { + base::win::RegKey policy_key(hive, + policy::kRegistryMandatorySubKey, + KEY_READ); + if (policy_key.ReadValue(key_name.c_str(), &value) == ERROR_SUCCESS) { *user_data_dir = FilePath(policy::path_parser::ExpandPathVariables(value)); return true; } |