diff options
| author | stoyan@chromium.org <stoyan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-03-08 16:26:11 +0000 |
|---|---|---|
| committer | stoyan@chromium.org <stoyan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-03-08 16:26:11 +0000 |
| commit | b1c5563861d33febd3ba84dfac70c7b6921bda26 (patch) | |
| tree | 8f7f9747e59f42cf0878edb8e599a3151e944045 /chrome_frame/chrome_active_document.h | |
| parent | 57fc471c6864dea93852742643e32d35a30c8559 (diff) | |
| download | chromium_src-b1c5563861d33febd3ba84dfac70c7b6921bda26.zip chromium_src-b1c5563861d33febd3ba84dfac70c7b6921bda26.tar.gz chromium_src-b1c5563861d33febd3ba84dfac70c7b6921bda26.tar.bz2 | |
ChromeFrame now uses host provided popup blocker.
It does not work in all scenarions since from Chrome side an empty string is passed as target url.
Note in IE6 "Tools/Popup Blocker" menu is not visible if ChromeFrame is the activedocument. Have to support some IOleCommandTarget command..
BUG=34823
Review URL: http://codereview.chromium.org/668168
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@40897 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome_frame/chrome_active_document.h')
| -rw-r--r-- | chrome_frame/chrome_active_document.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/chrome_frame/chrome_active_document.h b/chrome_frame/chrome_active_document.h index e7a4397..68c5c45 100644 --- a/chrome_frame/chrome_active_document.h +++ b/chrome_frame/chrome_active_document.h @@ -252,7 +252,8 @@ END_EXEC_COMMAND_MAP() // ChromeFrameActivexBase overrides virtual void OnOpenURL(int tab_handle, const GURL& url_to_open, const GURL& referrer, int open_disposition); - + virtual void OnAttachExternalTab(int tab_handle, + const IPC::AttachExternalTabParams& params); virtual void OnGoToHistoryEntryOffset(int tab_handle, int offset); // A helper method that updates our internal navigation state @@ -329,7 +330,7 @@ END_EXEC_COMMAND_MAP() bool is_automation_client_reused_; ScopedComPtr<IInternetSecurityManager> security_manager_; - + ScopedComPtr<INewWindowManager> popup_manager_; HACCEL accelerator_table_; public: |