summaryrefslogtreecommitdiffstats
path: root/chrome_frame/chrome_active_document.h
diff options
context:
space:
mode:
authorstoyan@chromium.org <stoyan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-03-15 17:01:34 +0000
committerstoyan@chromium.org <stoyan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-03-15 17:01:34 +0000
commit355309ef82ca45867d9e837a935514e3ca4c0f31 (patch)
tree6083d602e4fdfcd8f7aeb7ff92520f82311493b1 /chrome_frame/chrome_active_document.h
parent9d1c829b4bccfcd730f735db9a10f51848ac4396 (diff)
downloadchromium_src-355309ef82ca45867d9e837a935514e3ca4c0f31.zip
chromium_src-355309ef82ca45867d9e837a935514e3ca4c0f31.tar.gz
chromium_src-355309ef82ca45867d9e837a935514e3ca4c0f31.tar.bz2
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
Diffstat (limited to 'chrome_frame/chrome_active_document.h')
-rw-r--r--chrome_frame/chrome_active_document.h8
1 files changed, 7 insertions, 1 deletions
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<IInternetSecurityManager> security_manager_;
ScopedComPtr<INewWindowManager> popup_manager_;
+ bool popup_allowed_;
HACCEL accelerator_table_;
public: