From 355309ef82ca45867d9e837a935514e3ca4c0f31 Mon Sep 17 00:00:00 2001 From: "stoyan@chromium.org" Date: Mon, 15 Mar 2010 17:01:34 +0000 Subject: More integration with host (InternetExplorer) popup blocker. BUG=34823 Review URL: http://codereview.chromium.org/907005 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@41595 0039d316-1c4b-4281-b951-d872f2087c98 --- chrome_frame/chrome_active_document.h | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) (limited to 'chrome_frame/chrome_active_document.h') diff --git a/chrome_frame/chrome_active_document.h b/chrome_frame/chrome_active_document.h index 68c5c45..2e8840c 100644 --- a/chrome_frame/chrome_active_document.h +++ b/chrome_frame/chrome_active_document.h @@ -167,9 +167,9 @@ BEGIN_EXEC_COMMAND_MAP(ChromeActiveDocument) FORWARD_TAB_COMMAND(NULL, OLECMDID_CUT, Cut) FORWARD_TAB_COMMAND(NULL, OLECMDID_COPY, Copy) FORWARD_TAB_COMMAND(NULL, OLECMDID_PASTE, Paste) - FORWARD_TAB_COMMAND(NULL, OLECMDID_REFRESH, ReloadAsync) FORWARD_TAB_COMMAND(NULL, OLECMDID_STOP, StopAsync) FORWARD_TAB_COMMAND(NULL, OLECMDID_SAVEAS, SaveAsAsync) + EXEC_COMMAND_HANDLER(NULL, OLECMDID_REFRESH, OnRefreshPage) EXEC_COMMAND_HANDLER(&CGID_Explorer, SBCMDID_MIXEDZONE, OnDetermineSecurityZone) EXEC_COMMAND_HANDLER(&CGID_MSHTML, IDM_BASELINEFONT1, SetPageFontSize) @@ -299,6 +299,11 @@ END_EXEC_COMMAND_MAP() VARIANT* in_args, VARIANT* out_args); + // IOleCommandTarget handler for page refresh command + HRESULT OnRefreshPage(const GUID* cmd_group_guid, DWORD command_id, + DWORD cmd_exec_opt, VARIANT* in_args, VARIANT* out_args); + + // Get the travel log from the client site HRESULT GetBrowserServiceAndTravelLog(IBrowserService** browser_service, ITravelLog** travel_log); @@ -331,6 +336,7 @@ END_EXEC_COMMAND_MAP() ScopedComPtr security_manager_; ScopedComPtr popup_manager_; + bool popup_allowed_; HACCEL accelerator_table_; public: -- cgit v1.1