summaryrefslogtreecommitdiffstats
path: root/chrome_frame/chrome_tab.cc
diff options
context:
space:
mode:
authorananta@chromium.org <ananta@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-01-14 20:07:07 +0000
committerananta@chromium.org <ananta@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-01-14 20:07:07 +0000
commit9b7baa96df2be13a6aa17e3b7be6a2055fec9df3 (patch)
tree034ca993e90b7ed6579f43b271762b4023dd2812 /chrome_frame/chrome_tab.cc
parent5642a22177b70ff61104cf1b123fdb3adfe413aa (diff)
downloadchromium_src-9b7baa96df2be13a6aa17e3b7be6a2055fec9df3.zip
chromium_src-9b7baa96df2be13a6aa17e3b7be6a2055fec9df3.tar.gz
chromium_src-9b7baa96df2be13a6aa17e3b7be6a2055fec9df3.tar.bz2
Hopefully the last of the changes to fix the ChromeFrame InstallFlowTest failures. Basically
a dumb error caused by having a local variable with the same name as that of the parameter to a function. BUG=none TEST=ChromeFrame InstallFlowTest. TBR=amit Review URL: http://codereview.chromium.org/6303005 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@71477 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome_frame/chrome_tab.cc')
-rw-r--r--chrome_frame/chrome_tab.cc16
1 files changed, 8 insertions, 8 deletions
diff --git a/chrome_frame/chrome_tab.cc b/chrome_frame/chrome_tab.cc
index bb0bdc3..280e0a4 100644
--- a/chrome_frame/chrome_tab.cc
+++ b/chrome_frame/chrome_tab.cc
@@ -436,21 +436,21 @@ HRESULT SetChromeFrameUA(bool is_system, const wchar_t* value) {
RegKey ua_key;
if (ua_key.Create(parent_hive, kPostPlatformUAKey, KEY_READ | KEY_WRITE)) {
// Make sure that we unregister ChromeFrame UA strings registered previously
- wchar_t name[MAX_PATH + 1] = {};
- wchar_t value[MAX_PATH + 1] = {};
+ wchar_t value_name[MAX_PATH + 1] = {};
+ wchar_t value_data[MAX_PATH + 1] = {};
DWORD value_index = 0;
while (value_index < ua_key.ValueCount()) {
- DWORD name_size = arraysize(name);
- DWORD value_size = arraysize(value);
+ DWORD name_size = arraysize(value_name);
+ DWORD value_size = arraysize(value_data);
DWORD type = 0;
- LRESULT ret = ::RegEnumValue(ua_key.Handle(), value_index, name,
+ LRESULT ret = ::RegEnumValue(ua_key.Handle(), value_index, value_name,
&name_size, NULL, &type,
- reinterpret_cast<BYTE*>(value),
+ reinterpret_cast<BYTE*>(value_data),
&value_size);
if (ret == ERROR_SUCCESS) {
- if (StartsWith(name, kChromeFramePrefix, false)) {
- ua_key.DeleteValue(name);
+ if (StartsWith(value_name, kChromeFramePrefix, false)) {
+ ua_key.DeleteValue(value_name);
} else {
++value_index;
}