diff options
| author | slightlyoff@chromium.org <slightlyoff@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-03-26 04:16:20 +0000 |
|---|---|---|
| committer | slightlyoff@chromium.org <slightlyoff@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-03-26 04:16:20 +0000 |
| commit | bc73b4e541f57b44ac4c53df2589d91549f27eaf (patch) | |
| tree | 47cf0721b0f9d9cd0a9c83196d4091120300f3a4 /chrome_frame/bho.h | |
| parent | 46215d5ef32784db5544fc5f7ba06b6617935fec (diff) | |
| download | chromium_src-bc73b4e541f57b44ac4c53df2589d91549f27eaf.zip chromium_src-bc73b4e541f57b44ac4c53df2589d91549f27eaf.tar.gz chromium_src-bc73b4e541f57b44ac4c53df2589d91549f27eaf.tar.bz2 | |
3rd try. *sigh*
See: http://codereview.chromium.org/858003
TBR=tommi
BUG=22846
TEST=On IE 8, clear the cache entirely, watch GCF launch (via task manager)
Review URL: http://codereview.chromium.org/1343004
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@42732 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome_frame/bho.h')
| -rw-r--r-- | chrome_frame/bho.h | 14 |
1 files changed, 14 insertions, 0 deletions
diff --git a/chrome_frame/bho.h b/chrome_frame/bho.h index 9a36795..430436b 100644 --- a/chrome_frame/bho.h +++ b/chrome_frame/bho.h @@ -7,6 +7,7 @@ #include <atlbase.h> #include <atlcom.h> +#include <deletebrowsinghistory.h> #include <exdisp.h> #include <exdispid.h> #include <mshtml.h> @@ -16,11 +17,14 @@ #include "base/scoped_comptr_win.h" #include "chrome_tab.h" // NOLINT +#include "chrome_frame/delete_chrome_history.h" #include "chrome_frame/resource.h" #include "chrome_frame/urlmon_moniker.h" #include "chrome_frame/urlmon_url_request.h" #include "grit/chrome_frame_resources.h" +class DeleteChromeHistory; + class PatchHelper { public: enum State { UNKNOWN, PATCH_IBROWSER, PATCH_PROTOCOL }; @@ -55,12 +59,18 @@ class ATL_NO_VTABLE Bho IBrowserService* browser, IShellView* shell_view, BOOL done, VARIANT* in_arg, VARIANT* out_arg); +DECLARE_GET_CONTROLLING_UNKNOWN() DECLARE_REGISTRY_RESOURCEID(IDR_BHO) DECLARE_NOT_AGGREGATABLE(Bho) DECLARE_PROTECT_FINAL_CONSTRUCT() BEGIN_COM_MAP(Bho) COM_INTERFACE_ENTRY(IObjectWithSite) + // When calling DeleteChromeHistory, ensure that only one instance + // is created to avoid mulitple message loops. + COM_INTERFACE_ENTRY_CACHED_TEAR_OFF(IID_IDeleteBrowsingHistory, + DeleteChromeHistory, + delete_chrome_history_.p) END_COM_MAP() BEGIN_SINK_MAP(Bho) @@ -96,6 +106,10 @@ END_SINK_MAP() static void ProcessOptInUrls(IWebBrowser2* browser, BSTR url); + // COM_INTERFACE_ENTRY_CACHED_TEAR_OFF manages the raw pointer from CComPtr + // which ScopedComPtr doesn't expose. + CComPtr<IUnknown> delete_chrome_history_; + protected: bool PatchProtocolHandler(const CLSID& handler_clsid); |