diff options
| author | tommi@chromium.org <tommi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-02-05 19:36:49 +0000 |
|---|---|---|
| committer | tommi@chromium.org <tommi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-02-05 19:36:49 +0000 |
| commit | 8f4f152c5a9e4a4de7337d3f3c3e2d42d43f7448 (patch) | |
| tree | 6537384620c1faa2879acf62ac9cf41be451db07 /chrome_frame/bho.h | |
| parent | b97c8a2239a8e8ee4ae134d9ea95213067ead3c9 (diff) | |
| download | chromium_src-8f4f152c5a9e4a4de7337d3f3c3e2d42d43f7448.zip chromium_src-8f4f152c5a9e4a4de7337d3f3c3e2d42d43f7448.tar.gz chromium_src-8f4f152c5a9e4a4de7337d3f3c3e2d42d43f7448.tar.bz2 | |
Enable onhttpequiv again. The difference this time around is that we
perform the switch in onhttpequiv when done==false. Also, we don't
rely on having access to the already existing moniker but instead
create our own and DCHECK that it is IsRunning() (see comments).
TEST=The double loading effect we were seeing before should be gone.
BUG=33332
Review URL: http://codereview.chromium.org/576017
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@38232 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome_frame/bho.h')
| -rw-r--r-- | chrome_frame/bho.h | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/chrome_frame/bho.h b/chrome_frame/bho.h index 54bdc99..9c058ff 100644 --- a/chrome_frame/bho.h +++ b/chrome_frame/bho.h @@ -5,8 +5,6 @@ #ifndef CHROME_FRAME_BHO_H_ #define CHROME_FRAME_BHO_H_ -#include <string> - #include <atlbase.h> #include <atlcom.h> #include <exdisp.h> @@ -14,6 +12,8 @@ #include <mshtml.h> #include <shdeprecated.h> +#include <string> + #include "base/lazy_instance.h" #include "base/thread_local.h" #include "chrome_tab.h" // NOLINT @@ -62,8 +62,8 @@ BEGIN_COM_MAP(Bho) END_COM_MAP() BEGIN_SINK_MAP(Bho) - SINK_ENTRY_INFO(0, DIID_DWebBrowserEvents2, DISPID_BEFORENAVIGATE2, - BeforeNavigate2, &kBeforeNavigate2Info) + SINK_ENTRY_INFO(0, DIID_DWebBrowserEvents2, DISPID_BEFORENAVIGATE2, + BeforeNavigate2, &kBeforeNavigate2Info) END_SINK_MAP() // Lifetime management methods @@ -78,6 +78,8 @@ END_SINK_MAP() VARIANT* target_frame_name, VARIANT* post_data, VARIANT* headers, VARIANT_BOOL* cancel); + HRESULT NavigateToCurrentUrlInCF(IBrowserService* browser); + // mshtml sends an IOleCommandTarget::Exec of OLECMDID_HTTPEQUIV // (and OLECMDID_HTTPEQUIV_DONE) as soon as it parses a meta tag. // It also sends contents of the meta tag as an argument. IEFrame |