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

1 files changed, 6 insertions, 5 deletions

diff --git a/chrome/test/automation/automation_proxy_uitest.h b/chrome/test/automation/automation_proxy_uitest.h
index 27210ce..56d4054 100644
--- a/chrome/test/automation/automation_proxy_uitest.h
+++ b/chrome/test/automation/automation_proxy_uitest.h
@@ -55,11 +55,11 @@ class ExternalTabUITestMockClient : public AutomationProxy {
 
 
   MOCK_METHOD4(OnOpenURL, void(int tab_handle, const GURL& url,
-    const GURL& referrer, int open_disposition));
+      const GURL& referrer, int open_disposition));
   MOCK_METHOD3(OnNavigationStateChanged, void(int tab_handle, int flags,
-    const IPC::NavigationInfo& nav_info));
-  MOCK_METHOD3(OnAttachExternalTab, void(int tab_handle, intptr_t cookie,
-    int disposition));
+      const IPC::NavigationInfo& nav_info));
+  MOCK_METHOD2(OnAttachExternalTab, void(int tab_handle,
+      const IPC::AttachExternalTabParams& params));
   MOCK_METHOD2(OnLoad, void(int tab_handle, const GURL&url));
 
 
@@ -84,7 +84,8 @@ class ExternalTabUITestMockClient : public AutomationProxy {
   void NavigateThroughUserGesture();
   void IgnoreFavIconNetworkRequest();
 
-  void ConnectToExternalTab(gfx::NativeWindow parent, intptr_t cookie);
+  void ConnectToExternalTab(gfx::NativeWindow parent,
+      const IPC::AttachExternalTabParams& attach_params);
   // Helper for network requests.
   void ServeHTMLData(int tab_handle, const GURL& url, const std::string& data);
   // Destroys the host window.