diff options
| author | twiz@google.com <twiz@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-09-09 17:03:14 +0000 |
|---|---|---|
| committer | twiz@google.com <twiz@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-09-09 17:03:14 +0000 |
| commit | 8f56e617feb0bf1ecfb789458db52976a7d74a86 (patch) | |
| tree | 8e0025ae1b6b72f31211cd876c375baf6278423f /chrome_frame | |
| parent | 6b4583fef71394eb1f2fc57250e89b1c4db8bb4b (diff) | |
| download | chromium_src-8f56e617feb0bf1ecfb789458db52976a7d74a86.zip chromium_src-8f56e617feb0bf1ecfb789458db52976a7d74a86.tar.gz chromium_src-8f56e617feb0bf1ecfb789458db52976a7d74a86.tar.bz2 | |
For for CF test failure introduced by CL (http://codereview.chromium.org/3295019)
The problem is that by allowing ActiveX controls to hook top-level requests, the redirect in the ChromeFrameTestWithWebServer.WidgetModeIE_SrcProperty was being forwarded to the host browser in IE8.
BUG=54920
TEST=ChromeFrameTestWithWebServer.WidgetModeIE_SrcProperty
TBR=ananta
Review URL: http://codereview.chromium.org/3325019
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@58950 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome_frame')
| -rw-r--r-- | chrome_frame/chrome_active_document.cc | 10 | ||||
| -rw-r--r-- | chrome_frame/chrome_frame_activex_base.h | 9 |
2 files changed, 10 insertions, 9 deletions
diff --git a/chrome_frame/chrome_active_document.cc b/chrome_frame/chrome_active_document.cc index e48a8b8..37c089c 100644 --- a/chrome_frame/chrome_active_document.cc +++ b/chrome_frame/chrome_active_document.cc @@ -46,6 +46,9 @@ DEFINE_GUID(CGID_DocHostCmdPriv, 0x000214D4L, 0, 0, 0xC0, 0, 0, 0, 0, 0, 0, 0x46); +static const wchar_t kHandleTopLevelRequests[] = L"HandleTopLevelRequests"; +static const wchar_t kUseChromeNetworking[] = L"UseChromeNetworking"; + base::ThreadLocalPointer<ChromeActiveDocument> g_active_doc_cache; bool g_first_launch_by_process_ = true; @@ -93,6 +96,13 @@ HRESULT ChromeActiveDocument::FinalConstruct() { return hr; } + // Query and assign the top-level-request routing, and host networking + // settings from the registry. + bool top_level_requests = GetConfigBool(true, kHandleTopLevelRequests); + bool chrome_network = GetConfigBool(false, kUseChromeNetworking); + automation_client_->set_handle_top_level_requests(top_level_requests); + automation_client_->set_use_chrome_network(chrome_network); + find_dialog_.Init(automation_client_.get()); OLECMDF flags = static_cast<OLECMDF>(OLECMDF_ENABLED | OLECMDF_SUPPORTED); diff --git a/chrome_frame/chrome_frame_activex_base.h b/chrome_frame/chrome_frame_activex_base.h index de08d9a..10ad0d9 100644 --- a/chrome_frame/chrome_frame_activex_base.h +++ b/chrome_frame/chrome_frame_activex_base.h @@ -37,8 +37,6 @@ // Include without path to make GYP build see it. #include "chrome_tab.h" // NOLINT -static const wchar_t kUseChromeNetworking[] = L"UseChromeNetworking"; -static const wchar_t kHandleTopLevelRequests[] = L"HandleTopLevelRequests"; // Connection point class to support firing IChromeFrameEvents (dispinterface). template<class T> @@ -268,13 +266,6 @@ END_MSG_MAP() IE_8 + 1); } - // Query and assign the host networking and top-level-request settings - // from the registry. - bool chrome_network = GetConfigBool(false, kUseChromeNetworking); - bool top_level_requests = GetConfigBool(true, kHandleTopLevelRequests); - automation_client_->set_use_chrome_network(chrome_network); - automation_client_->set_handle_top_level_requests(top_level_requests); - return S_OK; } |