From b3615abab4cea4d7bed081de1fd7f037fb1fcef0 Mon Sep 17 00:00:00 2001 From: "ananta@chromium.org" Date: Thu, 12 Aug 2010 20:54:13 +0000 Subject: Fix chrome frame upgrade from old to new beta. During upgrade process, two versions of chrome frame may get loaded in IE at the same time. We have code to fallback to the old version in case this happens. However a small overight in declaring a local variable twice in different scopes led to these checks to fail. BUG=51620 TEST=test upgrade from 5.0.375.125 to 6.0.472.XXX while IE is running and try 'Open in New window' etc.. Review URL: http://codereview.chromium.org/3136009 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@55939 0039d316-1c4b-4281-b951-d872f2087c98 --- chrome_frame/module_utils.cc | 1 - 1 file changed, 1 deletion(-) (limited to 'chrome_frame') diff --git a/chrome_frame/module_utils.cc b/chrome_frame/module_utils.cc index 7a78620..62f07b8 100644 --- a/chrome_frame/module_utils.cc +++ b/chrome_frame/module_utils.cc @@ -51,7 +51,6 @@ HMODULE DllRedirector::GetFirstCFModule() { // TODO(amit): Remove this in future versions. if (reinterpret_cast(DefWindowProc) == oldest_module) { WNDCLASSEX wnd_class = {0}; - HMODULE oldest_module = NULL; HWND hwnd = CreateWindow(kBeaconWindowClassName, L"temp_window", WS_POPUP, 0, 0, 0, 0, NULL, NULL, NULL, NULL); DCHECK(IsWindow(hwnd)); -- cgit v1.1