diff options
| author | tommi@chromium.org <tommi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-11-03 01:14:45 +0000 |
|---|---|---|
| committer | tommi@chromium.org <tommi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-11-03 01:14:45 +0000 |
| commit | c9555c02cfaa69a50eff610edad10bbab938976a (patch) | |
| tree | a58159189529a195f808da586683dfe8a95893e8 /chrome_frame/protocol_sink_wrap.h | |
| parent | aca3e9b6ab27f5606b8b4ad6fcc27f0f0bc91f6e (diff) | |
| download | chromium_src-c9555c02cfaa69a50eff610edad10bbab938976a.zip chromium_src-c9555c02cfaa69a50eff610edad10bbab938976a.tar.gz chromium_src-c9555c02cfaa69a50eff610edad10bbab938976a.tar.bz2 | |
Don't switch to CF's active document for frames or iframes.This fixes an issue where a page that uses CF would be loaded in an IFRAME on Google Images.Instead of attempting to load CF (not supported), we now defer to the host browser. Previously a blank page was displayed.TEST=Run new unit tests: FullTabModeIE_SubIFrame and FullTabModeIE_SubFrameBUG=22989
Review URL: http://codereview.chromium.org/343086
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@30782 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome_frame/protocol_sink_wrap.h')
| -rw-r--r-- | chrome_frame/protocol_sink_wrap.h | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/chrome_frame/protocol_sink_wrap.h b/chrome_frame/protocol_sink_wrap.h index 4152be0..e8a7665 100644 --- a/chrome_frame/protocol_sink_wrap.h +++ b/chrome_frame/protocol_sink_wrap.h @@ -168,8 +168,6 @@ END_COM_MAP() static scoped_refptr<ProtocolSinkWrap> InstanceFromProtocol( IInternetProtocol* protocol); - static HRESULT WebBrowserFromProtocolSink(IInternetProtocolSink* sink, - IWebBrowser2** web_browser); static ScopedComPtr<IInternetProtocolSink> MaybeWrapSink( IInternetProtocol* protocol, IInternetProtocolSink* prot_sink, const wchar_t* url); |