diff options
author | hansl@google.com <hansl@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-11-05 22:06:31 +0000 |
---|---|---|
committer | hansl@google.com <hansl@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-11-05 22:06:31 +0000 |
commit | 751bf4bbbfa669bfa9c21eef69c150b8bdbf2250 (patch) | |
tree | 38a1859c3d8e256161f98d3df29ca051a38fbed3 /chrome_frame/chrome_frame_automation.h | |
parent | a18194ac534a98e9a6527fb3633fa38db9b6459f (diff) | |
download | chromium_src-751bf4bbbfa669bfa9c21eef69c150b8bdbf2250.zip chromium_src-751bf4bbbfa669bfa9c21eef69c150b8bdbf2250.tar.gz chromium_src-751bf4bbbfa669bfa9c21eef69c150b8bdbf2250.tar.bz2 |
Add support for returning the session_id in both CreateExternalTab and ConnectExternalTab.
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. This ID is necessary in CEEE for its tabs management.
BUG=None
TEST=None
Review URL: http://codereview.chromium.org/4467002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@65257 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome_frame/chrome_frame_automation.h')
-rw-r--r-- | chrome_frame/chrome_frame_automation.h | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/chrome_frame/chrome_frame_automation.h b/chrome_frame/chrome_frame_automation.h index 47b03c0..cb1b282 100644 --- a/chrome_frame/chrome_frame_automation.h +++ b/chrome_frame/chrome_frame_automation.h @@ -364,6 +364,9 @@ class ChromeFrameAutomationClient void* user_data, std::vector<FilePath>* extension_directories); + // Returns the session ID used to identify a Tab in Chrome. + virtual int GetSessionId() const; + virtual void OnChromeFrameHostMoved(); TabProxy* tab() const { return tab_.get(); } @@ -458,7 +461,8 @@ class ChromeFrameAutomationClient void CreateExternalTab(); AutomationLaunchResult CreateExternalTabComplete(HWND chrome_window, HWND tab_window, - int tab_handle); + int tab_handle, + int session_id); // Called in UI thread. Here we fire event to the client notifying for // the result of Initialize() method call. void InitializeComplete(AutomationLaunchResult result); @@ -529,6 +533,8 @@ class ChromeFrameAutomationClient bool handle_top_level_requests_; ProxyFactory* proxy_factory_; int tab_handle_; + // The SessionId used by Chrome as the id in the Javascript Tab object. + int session_id_; // Only used if we attach to an existing tab. uint64 external_tab_cookie_; |