From ecdf634e197d6041d705aa5ea4430938f44f5f91 Mon Sep 17 00:00:00 2001 From: "tommi@chromium.org" Date: Fri, 22 Jan 2010 18:49:47 +0000 Subject: Implement OptInUrls using the same mechanism we use in the onhttpequiv notification. A noteworthy change here is that OptInUrls doesn't rely on cf: anymore. TEST=The OptInUrls registry key should start working properly again. BUG=32660 Review URL: http://codereview.chromium.org/549129 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@36874 0039d316-1c4b-4281-b951-d872f2087c98 --- chrome_frame/utils.cc | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'chrome_frame/utils.cc') diff --git a/chrome_frame/utils.cc b/chrome_frame/utils.cc index 3ef49df..e0b407b 100644 --- a/chrome_frame/utils.cc +++ b/chrome_frame/utils.cc @@ -728,7 +728,8 @@ HRESULT NavigateBrowserToMoniker(IUnknown* browser, IMoniker* moniker, void MarkBrowserOnThreadForCFNavigation(IBrowserService* browser) { DCHECK(browser != NULL); - DCHECK(g_tls_browser_for_cf_navigation.Pointer()->Get() == NULL); + DCHECK(g_tls_browser_for_cf_navigation.Pointer()->Get() == NULL || + g_tls_browser_for_cf_navigation.Pointer()->Get() == browser); g_tls_browser_for_cf_navigation.Pointer()->Set(browser); } -- cgit v1.1