diff options
author | hansl@google.com <hansl@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-11-05 22:06:31 +0000 |
---|---|---|
committer | hansl@google.com <hansl@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-11-05 22:06:31 +0000 |
commit | 751bf4bbbfa669bfa9c21eef69c150b8bdbf2250 (patch) | |
tree | 38a1859c3d8e256161f98d3df29ca051a38fbed3 /chrome_frame/cfproxy_support.cc | |
parent | a18194ac534a98e9a6527fb3633fa38db9b6459f (diff) | |
download | chromium_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_support.cc')
-rw-r--r-- | chrome_frame/cfproxy_support.cc | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/chrome_frame/cfproxy_support.cc b/chrome_frame/cfproxy_support.cc index 42e6a28..6b5224b 100644 --- a/chrome_frame/cfproxy_support.cc +++ b/chrome_frame/cfproxy_support.cc @@ -20,10 +20,10 @@ void DispatchReplyFail(uint32 type, SyncMessageContext* ctx) { switch (type) { case AutomationMsg_CreateExternalTab::ID: - delegate->Completed_CreateTab(false, NULL, NULL, NULL); + delegate->Completed_CreateTab(false, NULL, NULL, 0, 0); break; case AutomationMsg_ConnectExternalTab::ID: - delegate->Completed_ConnectToTab(false, NULL, NULL, NULL); + delegate->Completed_ConnectToTab(false, NULL, NULL, 0, 0); break; case AutomationMsg_InstallExtension::ID: delegate->Completed_InstallExtension(false, @@ -38,23 +38,23 @@ bool DispatchReplyOk(const IPC::Message* reply_msg, uint32 type, void* iter = IPC::SyncMessage::GetDataIterator(reply_msg); switch (type) { case AutomationMsg_CreateExternalTab::ID: { - // Tuple3<HWND, HWND, int> out; + // Tuple4<HWND, HWND, int, int> out; TupleTypes<AutomationMsg_CreateExternalTab::ReplyParam>::ValueTuple out; if (ReadParam(reply_msg, &iter, &out)) { DCHECK(tab2delegate->find(out.c) == tab2delegate->end()); (*tab2delegate)[out.c] = delegate; - delegate->Completed_CreateTab(true, out.a, out.b, out.c); + delegate->Completed_CreateTab(true, out.a, out.b, out.c, out.d); } return true; } case AutomationMsg_ConnectExternalTab::ID: { - // Tuple3<HWND, HWND, int> out; + // Tuple4<HWND, HWND, int, int> out; TupleTypes<AutomationMsg_ConnectExternalTab::ReplyParam>::ValueTuple out; if (ReadParam(reply_msg, &iter, &out)) { DCHECK(tab2delegate->find(out.c) == tab2delegate->end()); (*tab2delegate)[out.c] = delegate; - delegate->Completed_ConnectToTab(true, out.a, out.b, out.c); + delegate->Completed_ConnectToTab(true, out.a, out.b, out.c, out.d); } return true; } |