diff options
| author | ananta@chromium.org <ananta@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-04-20 23:28:52 +0000 |
|---|---|---|
| committer | ananta@chromium.org <ananta@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-04-20 23:28:52 +0000 |
| commit | 830005dd23868ae6a4fe75dab08c08ee04831ca2 (patch) | |
| tree | db98eda277bb2a78e00b4424116f22e76f624d40 /chrome_frame/bho.cc | |
| parent | 29c32f903806efbc167a417c170b896dfeecc33f (diff) | |
| download | chromium_src-830005dd23868ae6a4fe75dab08c08ee04831ca2.zip chromium_src-830005dd23868ae6a4fe75dab08c08ee04831ca2.tar.gz chromium_src-830005dd23868ae6a4fe75dab08c08ee04831ca2.tar.bz2 | |
In ChromeFrame with the moniker patch enabled we should not process optin urls in the BHO.
Fixes bug http://code.google.com/p/chromium/issues/detail?id=42155
Bug=42155
Review URL: http://codereview.chromium.org/1706003
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@45117 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome_frame/bho.cc')
| -rw-r--r-- | chrome_frame/bho.cc | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/chrome_frame/bho.cc b/chrome_frame/bho.cc index 5ea51125..7ca9bff 100644 --- a/chrome_frame/bho.cc +++ b/chrome_frame/bho.cc @@ -121,9 +121,10 @@ STDMETHODIMP Bho::BeforeNavigate2(IDispatch* dispatch, VARIANT* url, if (is_top_level) { set_url(url->bstrVal); set_referrer(""); - ProcessOptInUrls(web_browser2, url->bstrVal); + if (!MonikerPatchEnabled()) { + ProcessOptInUrls(web_browser2, url->bstrVal); + } } - return S_OK; } @@ -314,9 +315,7 @@ bool PatchHelper::InitializeAndPatchProtocolsIfNeeded() { HttpNegotiatePatch::Initialize(); - ProtocolPatchMethod patch_method = - static_cast<ProtocolPatchMethod>( - GetConfigInt(PATCH_METHOD_MONIKER, kPatchProtocols)); + ProtocolPatchMethod patch_method = GetPatchMethod(); if (patch_method == PATCH_METHOD_INET_PROTOCOL) { ProtocolSinkWrap::PatchProtocolHandlers(); state_ = PATCH_PROTOCOL; |