summaryrefslogtreecommitdiffstats
path: root/chrome_frame/external_tab.cc
diff options
context:
space:
mode:
authorhansl@google.com <hansl@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2010-10-28 16:05:36 +0000
committerhansl@google.com <hansl@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2010-10-28 16:05:36 +0000
commitd57b6ab5930b827b56d412b1d334620c91e8cdbd (patch)
tree7ec5d9867db431d3a89092fcebd2327078c64c16 /chrome_frame/external_tab.cc
parent8073fb0ca593e537c75d1b40b7206b4f58434d86 (diff)
downloadchromium_src-d57b6ab5930b827b56d412b1d334620c91e8cdbd.zip
chromium_src-d57b6ab5930b827b56d412b1d334620c91e8cdbd.tar.gz
chromium_src-d57b6ab5930b827b56d412b1d334620c91e8cdbd.tar.bz2
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.
Review URL: http://codereview.chromium.org/3541017 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@64252 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome_frame/external_tab.cc')
-rw-r--r--chrome_frame/external_tab.cc8
1 files changed, 5 insertions, 3 deletions
diff --git a/chrome_frame/external_tab.cc b/chrome_frame/external_tab.cc
index 4bfeff2..7b6fe92 100644
--- a/chrome_frame/external_tab.cc
+++ b/chrome_frame/external_tab.cc
@@ -194,7 +194,8 @@ void ExternalTabProxy::ChromeFrameHostMoved() {
//////////////////////////////////////////////////////////////////////////
void ExternalTabProxy::UiCompleted_CreateTab(bool success, HWND chrome_window,
- HWND tab_window, int tab_handle) {
+ HWND tab_window, int tab_handle,
+ int session_id) {
if (success) {
state_ = READY;
tab_ = tab_handle;
@@ -210,11 +211,12 @@ void ExternalTabProxy::UiCompleted_CreateTab(bool success, HWND chrome_window,
}
void ExternalTabProxy::Completed_CreateTab(bool success, HWND chrome_wnd,
- HWND tab_window, int tab_handle) {
+ HWND tab_window, int tab_handle,
+ int session_id) {
// in ipc_thread.
ui_.PostTask(FROM_HERE, NewRunnableMethod(this,
&ExternalTabProxy::UiCompleted_CreateTab,
- success, chrome_wnd, tab_window, tab_handle));
+ success, chrome_wnd, tab_window, tab_handle, session_id));
}
void ExternalTabProxy::Completed_ConnectToTab(bool success,