diff options
| author | ananta@chromium.org <ananta@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-10-28 18:56:35 +0000 |
|---|---|---|
| committer | ananta@chromium.org <ananta@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-10-28 18:56:35 +0000 |
| commit | 785993e730139a6c5a93b69ca4dfdc313db59895 (patch) | |
| tree | 5a33a5b01a70bc344f438b84a1023d6ef8f8f12e /chrome/test/automation | |
| parent | 4d10edeb5f3db4366b4521c2346bfb4741c21e6f (diff) | |
| download | chromium_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/test/automation')
| -rw-r--r-- | chrome/test/automation/automation_messages_internal.h | 5 | ||||
| -rw-r--r-- | chrome/test/automation/automation_proxy.cc | 4 |
2 files changed, 3 insertions, 6 deletions
diff --git a/chrome/test/automation/automation_messages_internal.h b/chrome/test/automation/automation_messages_internal.h index e8fd57f..adadf68 100644 --- a/chrome/test/automation/automation_messages_internal.h +++ b/chrome/test/automation/automation_messages_internal.h @@ -428,12 +428,11 @@ IPC_BEGIN_MESSAGES(Automation) // hosted by an external process. // Request: // ExternalTabSettings - settings for external tab - IPC_SYNC_MESSAGE_ROUTED1_4(AutomationMsg_CreateExternalTab, + IPC_SYNC_MESSAGE_ROUTED1_3(AutomationMsg_CreateExternalTab, IPC::ExternalTabSettings /* settings*/, gfx::NativeWindow /* Tab container window */, gfx::NativeWindow /* Tab window */, - int /* Handle to the new tab */, - int /* Session Id of the new tab */) + int /* Handle to 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 748ffc2..3f6eb64 100644 --- a/chrome/test/automation/automation_proxy.cc +++ b/chrome/test/automation/automation_proxy.cc @@ -487,13 +487,11 @@ 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, - &session_id)); + &handle)); if (!succeeded) { return NULL; } |