Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(390)

Side by Side Diff: webkit/glue/plugins/webplugin_delegate_impl_win.cc

Issue 3185032: Reland r57575 - Remove the default argument from RegKey::Open. (Closed) Base URL: git://git.chromium.org/chromium.git
Patch Set: policy fixes Created 10 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « chrome/browser/policy/configuration_policy_provider_win.cc ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2010 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2010 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "webkit/glue/plugins/webplugin_delegate_impl.h" 5 #include "webkit/glue/plugins/webplugin_delegate_impl.h"
6 6
7 #include <map> 7 #include <map>
8 #include <string> 8 #include <string>
9 #include <vector> 9 #include <vector>
10 10
(...skipping 394 matching lines...) Expand 10 before | Expand all | Expand 10 after
405 GetCurrentThreadId()); 405 GetCurrentThreadId());
406 } 406 }
407 } 407 }
408 408
409 // On XP, WMP will use its old UI unless a registry key under HKLM has the 409 // On XP, WMP will use its old UI unless a registry key under HKLM has the
410 // name of the current process. We do it in the installer for admin users, 410 // name of the current process. We do it in the installer for admin users,
411 // for the rest patch this function. 411 // for the rest patch this function.
412 if ((quirks_ & PLUGIN_QUIRK_PATCH_REGENUMKEYEXW) && 412 if ((quirks_ & PLUGIN_QUIRK_PATCH_REGENUMKEYEXW) &&
413 win_util::GetWinVersion() == win_util::WINVERSION_XP && 413 win_util::GetWinVersion() == win_util::WINVERSION_XP &&
414 !RegKey().Open(HKEY_LOCAL_MACHINE, 414 !RegKey().Open(HKEY_LOCAL_MACHINE,
415 L"SOFTWARE\\Microsoft\\MediaPlayer\\ShimInclusionList\\chrome.exe") && 415 L"SOFTWARE\\Microsoft\\MediaPlayer\\ShimInclusionList\\chrome.exe",
416 KEY_READ) &&
416 !g_iat_patch_reg_enum_key_ex_w.Pointer()->is_patched()) { 417 !g_iat_patch_reg_enum_key_ex_w.Pointer()->is_patched()) {
417 g_iat_patch_reg_enum_key_ex_w.Pointer()->Patch( 418 g_iat_patch_reg_enum_key_ex_w.Pointer()->Patch(
418 L"wmpdxm.dll", "advapi32.dll", "RegEnumKeyExW", 419 L"wmpdxm.dll", "advapi32.dll", "RegEnumKeyExW",
419 WebPluginDelegateImpl::RegEnumKeyExWPatch); 420 WebPluginDelegateImpl::RegEnumKeyExWPatch);
420 } 421 }
421 422
422 return true; 423 return true;
423 } 424 }
424 425
425 void WebPluginDelegateImpl::PlatformDestroyInstance() { 426 void WebPluginDelegateImpl::PlatformDestroyInstance() {
(...skipping 964 matching lines...) Expand 10 before | Expand all | Expand 10 after
1390 case WM_LBUTTONUP: 1391 case WM_LBUTTONUP:
1391 case WM_MBUTTONUP: 1392 case WM_MBUTTONUP:
1392 case WM_RBUTTONUP: 1393 case WM_RBUTTONUP:
1393 ::ReleaseCapture(); 1394 ::ReleaseCapture();
1394 break; 1395 break;
1395 1396
1396 default: 1397 default:
1397 break; 1398 break;
1398 } 1399 }
1399 } 1400 }
OLDNEW
« no previous file with comments | « chrome/browser/policy/configuration_policy_provider_win.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698