summaryrefslogtreecommitdiffstats
path: root/chrome_frame/cfproxy_proxy.cc
diff options
context:
space:
mode:
authorhansl@google.com <hansl@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2010-11-05 22:06:31 +0000
committerhansl@google.com <hansl@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2010-11-05 22:06:31 +0000
commit751bf4bbbfa669bfa9c21eef69c150b8bdbf2250 (patch)
tree38a1859c3d8e256161f98d3df29ca051a38fbed3 /chrome_frame/cfproxy_proxy.cc
parenta18194ac534a98e9a6527fb3633fa38db9b6459f (diff)
downloadchromium_src-751bf4bbbfa669bfa9c21eef69c150b8bdbf2250.zip
chromium_src-751bf4bbbfa669bfa9c21eef69c150b8bdbf2250.tar.gz
chromium_src-751bf4bbbfa669bfa9c21eef69c150b8bdbf2250.tar.bz2
Add support for returning the session_id in both CreateExternalTab and ConnectExternalTab.
The ChromeFrame objects now provides an unfrozen interface called IChromeFramePrivate. This interface provides a GetSessionId() which returns the ID used by Chrome in its Tab javascript object. This ID is necessary in CEEE for its tabs management. BUG=None TEST=None Review URL: http://codereview.chromium.org/4467002 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@65257 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome_frame/cfproxy_proxy.cc')
-rw-r--r--chrome_frame/cfproxy_proxy.cc6
1 files changed, 3 insertions, 3 deletions
diff --git a/chrome_frame/cfproxy_proxy.cc b/chrome_frame/cfproxy_proxy.cc
index e03cb0e..5d6a780 100644
--- a/chrome_frame/cfproxy_proxy.cc
+++ b/chrome_frame/cfproxy_proxy.cc
@@ -181,7 +181,7 @@ void CFProxy::Tab_Navigate(int tab, const GURL& url, const GURL& referrer) {
void CFProxy::CreateTab(ChromeProxyDelegate* delegate,
const IPC::ExternalTabSettings& p) {
- IPC::SyncMessage* m = new AutomationMsg_CreateExternalTab(0, p, 0, 0, 0);
+ IPC::SyncMessage* m = new AutomationMsg_CreateExternalTab(0, p, 0, 0, 0, 0);
sync_dispatcher_.QueueSyncMessage(m, delegate, NULL);
SendIpcMessage(m);
}
@@ -189,14 +189,14 @@ void CFProxy::CreateTab(ChromeProxyDelegate* delegate,
void CFProxy::ConnectTab(ChromeProxyDelegate* delegate, HWND hwnd,
uint64 cookie) {
IPC::SyncMessage* m = new AutomationMsg_ConnectExternalTab(0, cookie, true,
- hwnd, NULL, NULL, NULL);
+ hwnd, NULL, NULL, NULL, 0);
sync_dispatcher_.QueueSyncMessage(m, delegate, NULL);
SendIpcMessage(m);
}
void CFProxy::BlockTab(uint64 cookie) {
IPC::SyncMessage* m = new AutomationMsg_ConnectExternalTab(0, cookie, false,
- NULL, NULL, NULL, NULL);
+ NULL, NULL, NULL, NULL, 0);
sync_dispatcher_.QueueSyncMessage(m, NULL, NULL);
SendIpcMessage(m);
}