summaryrefslogtreecommitdiffstats
path: root/chrome/browser
diff options
context:
space:
mode:
authorchase@chromium.org <chase@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-08-26 20:27:16 +0000
committerchase@chromium.org <chase@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-08-26 20:27:16 +0000
commitfb56c27c85e46336d505cf51047345c5389cedba (patch)
treea278db90496c09bd01476cc3b43d662bb7e57400 /chrome/browser
parentd7a49c7c5c445c4f911c65e834305c03604a9ede (diff)
downloadchromium_src-fb56c27c85e46336d505cf51047345c5389cedba.zip
chromium_src-fb56c27c85e46336d505cf51047345c5389cedba.tar.gz
chromium_src-fb56c27c85e46336d505cf51047345c5389cedba.tar.bz2
Revert 57572 - Remove the default argument from RegKey::Open.
Caused a failure on Windows Chromium Builder (dbg): ...\configuration_policy_provider_win.cc(71) : error C2660: 'RegKey::Open' : function does not take 2 arguments BUG=44644 TEST=base_unittests --gtest_filter=RegistryTest.* Review URL: http://codereview.chromium.org/3205007 TBR=tfarina@chromium.org Review URL: http://codereview.chromium.org/3211004 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@57575 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser')
-rw-r--r--chrome/browser/extensions/extension_rlz_apitest.cc6
-rw-r--r--chrome/browser/extensions/external_registry_extension_provider_win.cc4
-rw-r--r--chrome/browser/platform_util_win.cc2
-rw-r--r--chrome/browser/policy/configuration_policy_provider_win.cc2
4 files changed, 6 insertions, 8 deletions
diff --git a/chrome/browser/extensions/extension_rlz_apitest.cc b/chrome/browser/extensions/extension_rlz_apitest.cc
index c9c1416..910a530 100644
--- a/chrome/browser/extensions/extension_rlz_apitest.cc
+++ b/chrome/browser/extensions/extension_rlz_apitest.cc
@@ -71,8 +71,7 @@ IN_PROC_BROWSER_TEST_F(ExtensionApiTest, Rlz) {
// Now make sure we recorded what was expected. If the code in test.js
// changes, need to make appropriate changes here.
- key.Open(HKEY_CURRENT_USER, L"Software\\Google\\Common\\Rlz\\Events\\N",
- KEY_READ);
+ key.Open(HKEY_CURRENT_USER, L"Software\\Google\\Common\\Rlz\\Events\\N");
ASSERT_TRUE(key.Valid());
DWORD value;
@@ -86,8 +85,7 @@ IN_PROC_BROWSER_TEST_F(ExtensionApiTest, Rlz) {
ASSERT_TRUE(key.ReadValueDW(L"D4I", &value));
ASSERT_EQ(1, value);
- key.Open(HKEY_CURRENT_USER, L"Software\\Google\\Common\\Rlz\\Events\\D",
- KEY_READ);
+ key.Open(HKEY_CURRENT_USER, L"Software\\Google\\Common\\Rlz\\Events\\D");
ASSERT_FALSE(key.Valid());
// Cleanup.
diff --git a/chrome/browser/extensions/external_registry_extension_provider_win.cc b/chrome/browser/extensions/external_registry_extension_provider_win.cc
index 35ed4ae..d34735f 100644
--- a/chrome/browser/extensions/external_registry_extension_provider_win.cc
+++ b/chrome/browser/extensions/external_registry_extension_provider_win.cc
@@ -37,7 +37,7 @@ void ExternalRegistryExtensionProvider::VisitRegisteredExtension(
std::wstring key_path = ASCIIToWide(kRegistryExtensions);
key_path.append(L"\\");
key_path.append(iterator.Name());
- if (key.Open(kRegRoot, key_path.c_str(), KEY_READ)) {
+ if (key.Open(kRegRoot, key_path.c_str())) {
std::wstring extension_path;
if (key.ReadValue(kRegistryExtensionPath, &extension_path)) {
std::wstring extension_version;
@@ -77,7 +77,7 @@ Version* ExternalRegistryExtensionProvider::RegisteredVersion(
key_path.append(L"\\");
key_path.append(ASCIIToWide(id));
- if (!key.Open(kRegRoot, key_path.c_str(), KEY_READ))
+ if (!key.Open(kRegRoot, key_path.c_str()))
return NULL;
std::wstring extension_version;
diff --git a/chrome/browser/platform_util_win.cc b/chrome/browser/platform_util_win.cc
index d928a2d..5157cb4 100644
--- a/chrome/browser/platform_util_win.cc
+++ b/chrome/browser/platform_util_win.cc
@@ -113,7 +113,7 @@ void OpenExternal(const GURL& url) {
RegKey key;
std::wstring registry_path = ASCIIToWide(url.scheme()) +
L"\\shell\\open\\command";
- key.Open(HKEY_CLASSES_ROOT, registry_path.c_str(), KEY_READ);
+ key.Open(HKEY_CLASSES_ROOT, registry_path.c_str());
if (key.Valid()) {
DWORD size = 0;
key.ReadValue(NULL, NULL, &size);
diff --git a/chrome/browser/policy/configuration_policy_provider_win.cc b/chrome/browser/policy/configuration_policy_provider_win.cc
index e69b8d4..5d79da6 100644
--- a/chrome/browser/policy/configuration_policy_provider_win.cc
+++ b/chrome/browser/policy/configuration_policy_provider_win.cc
@@ -62,7 +62,7 @@ bool ConfigurationPolicyProviderWin::GetRegistryPolicyString(
string16 path = string16(policy::kRegistrySubKey);
RegKey policy_key;
// First try the global policy.
- if (policy_key.Open(HKEY_LOCAL_MACHINE, path.c_str(), KEY_READ)) {
+ if (policy_key.Open(HKEY_LOCAL_MACHINE, path.c_str())) {
if (ReadRegistryStringValue(&policy_key, name, result))
return true;
policy_key.Close();