diff options
author | hansl@google.com <hansl@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-10-28 16:05:36 +0000 |
---|---|---|
committer | hansl@google.com <hansl@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-10-28 16:05:36 +0000 |
commit | d57b6ab5930b827b56d412b1d334620c91e8cdbd (patch) | |
tree | 7ec5d9867db431d3a89092fcebd2327078c64c16 /chrome/test | |
parent | 8073fb0ca593e537c75d1b40b7206b4f58434d86 (diff) | |
download | chromium_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/test')
-rw-r--r-- | chrome/test/automation/automation_messages_internal.h | 5 | ||||
-rw-r--r-- | chrome/test/automation/automation_proxy.cc | 4 |
2 files changed, 6 insertions, 3 deletions
diff --git a/chrome/test/automation/automation_messages_internal.h b/chrome/test/automation/automation_messages_internal.h index adadf68..e8fd57f 100644 --- a/chrome/test/automation/automation_messages_internal.h +++ b/chrome/test/automation/automation_messages_internal.h @@ -428,11 +428,12 @@ IPC_BEGIN_MESSAGES(Automation) // hosted by an external process. // Request: // ExternalTabSettings - settings for external tab - IPC_SYNC_MESSAGE_ROUTED1_3(AutomationMsg_CreateExternalTab, + IPC_SYNC_MESSAGE_ROUTED1_4(AutomationMsg_CreateExternalTab, IPC::ExternalTabSettings /* settings*/, gfx::NativeWindow /* Tab container window */, gfx::NativeWindow /* Tab window */, - int /* Handle to the new tab */) + int /* Handle to the new tab */, + int /* Session Id of the new tab */) // This message notifies the AutomationProvider to navigate to a specified // url in the external tab with given handle. The first parameter is the diff --git a/chrome/test/automation/automation_proxy.cc b/chrome/test/automation/automation_proxy.cc index 3f6eb64..748ffc2 100644 --- a/chrome/test/automation/automation_proxy.cc +++ b/chrome/test/automation/automation_proxy.cc @@ -487,11 +487,13 @@ scoped_refptr<TabProxy> AutomationProxy::CreateExternalTab( gfx::NativeWindow* external_tab_container, gfx::NativeWindow* tab) { int handle = 0; + int session_id = 0; bool succeeded = Send(new AutomationMsg_CreateExternalTab(0, settings, external_tab_container, tab, - &handle)); + &handle, + &session_id)); if (!succeeded) { return NULL; } |