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/browser/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/browser/automation')
| -rw-r--r-- | chrome/browser/automation/automation_provider.h | 3 | ||||
| -rw-r--r-- | chrome/browser/automation/automation_provider_win.cc | 4 |
2 files changed, 2 insertions, 5 deletions
diff --git a/chrome/browser/automation/automation_provider.h b/chrome/browser/automation/automation_provider.h index ff3b355..5a29b04 100644 --- a/chrome/browser/automation/automation_provider.h +++ b/chrome/browser/automation/automation_provider.h @@ -357,8 +357,7 @@ class AutomationProvider : public base::RefCounted<AutomationProvider>, void CreateExternalTab(const IPC::ExternalTabSettings& settings, gfx::NativeWindow* tab_container_window, gfx::NativeWindow* tab_window, - int* tab_handle, - int* session_id); + int* tab_handle); void ConnectExternalTab(uint64 cookie, bool allow, diff --git a/chrome/browser/automation/automation_provider_win.cc b/chrome/browser/automation/automation_provider_win.cc index 6420b56..7843c83 100644 --- a/chrome/browser/automation/automation_provider_win.cc +++ b/chrome/browser/automation/automation_provider_win.cc @@ -241,13 +241,12 @@ void AutomationProvider::GetTabHWND(int handle, HWND* tab_hwnd) { void AutomationProvider::CreateExternalTab( const IPC::ExternalTabSettings& settings, gfx::NativeWindow* tab_container_window, gfx::NativeWindow* tab_window, - int* tab_handle, int* session_id) { + int* tab_handle) { TRACE_EVENT_BEGIN("AutomationProvider::CreateExternalTab", 0, ""); *tab_handle = 0; *tab_container_window = NULL; *tab_window = NULL; - *session_id = -1; scoped_refptr<ExternalTabContainer> external_tab_container = new ExternalTabContainer(this, automation_resource_message_filter_); @@ -267,7 +266,6 @@ void AutomationProvider::CreateExternalTab( *tab_handle = external_tab_container->tab_handle(); *tab_container_window = external_tab_container->GetNativeView(); *tab_window = tab_contents->GetNativeView(); - *session_id = tab_contents->controller().session_id().id(); } else { external_tab_container->Uninitialize(); } |