summaryrefslogtreecommitdiffstats
path: root/chrome_frame/external_tab.cc
diff options
context:
space:
mode:
authorananta@chromium.org <ananta@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-10-28 18:56:35 +0000
committerananta@chromium.org <ananta@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-10-28 18:56:35 +0000
commit785993e730139a6c5a93b69ca4dfdc313db59895 (patch)
tree5a33a5b01a70bc344f438b84a1023d6ef8f8f12e /chrome_frame/external_tab.cc
parent4d10edeb5f3db4366b4521c2346bfb4741c21e6f (diff)
downloadchromium_src-785993e730139a6c5a93b69ca4dfdc313db59895.zip
chromium_src-785993e730139a6c5a93b69ca4dfdc313db59895.tar.gz
chromium_src-785993e730139a6c5a93b69ca4dfdc313db59895.tar.bz2
Reverting this to see if this fixes ChromeFrame tests. Please reland with the tests fixed.
Revert 64252 - 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 TBR=hansl@google.com Review URL: http://codereview.chromium.org/4134008 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@64287 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome_frame/external_tab.cc')
-rw-r--r--chrome_frame/external_tab.cc8
1 files changed, 3 insertions, 5 deletions
diff --git a/chrome_frame/external_tab.cc b/chrome_frame/external_tab.cc
index 7b6fe92..4bfeff2 100644
--- a/chrome_frame/external_tab.cc
+++ b/chrome_frame/external_tab.cc
@@ -194,8 +194,7 @@ void ExternalTabProxy::ChromeFrameHostMoved() {
//////////////////////////////////////////////////////////////////////////
void ExternalTabProxy::UiCompleted_CreateTab(bool success, HWND chrome_window,
- HWND tab_window, int tab_handle,
- int session_id) {
+ HWND tab_window, int tab_handle) {
if (success) {
state_ = READY;
tab_ = tab_handle;
@@ -211,12 +210,11 @@ void ExternalTabProxy::UiCompleted_CreateTab(bool success, HWND chrome_window,
}
void ExternalTabProxy::Completed_CreateTab(bool success, HWND chrome_wnd,
- HWND tab_window, int tab_handle,
- int session_id) {
+ HWND tab_window, int tab_handle) {
// in ipc_thread.
ui_.PostTask(FROM_HERE, NewRunnableMethod(this,
&ExternalTabProxy::UiCompleted_CreateTab,
- success, chrome_wnd, tab_window, tab_handle, session_id));
+ success, chrome_wnd, tab_window, tab_handle));
}
void ExternalTabProxy::Completed_ConnectToTab(bool success,