diff options
| author | rogerta@chromium.org <rogerta@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-11-24 21:13:16 +0000 |
|---|---|---|
| committer | rogerta@chromium.org <rogerta@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-11-24 21:13:16 +0000 |
| commit | 69e4b61b7bfc27a6eefb1bcd1483e47f4a7777b1 (patch) | |
| tree | 69dcf67b49eb02cefd2a87d418c90844735f76a2 /chrome_frame/chrome_frame_npapi.cc | |
| parent | f57075e5ad3bd3601ed621cc4bf0deb37d1dd52e (diff) | |
| download | chromium_src-69e4b61b7bfc27a6eefb1bcd1483e47f4a7777b1.zip chromium_src-69e4b61b7bfc27a6eefb1bcd1483e47f4a7777b1.tar.gz chromium_src-69e4b61b7bfc27a6eefb1bcd1483e47f4a7777b1.tar.bz2 | |
Export the new sessionid property of Chrome Frame form the NPAPI interface.
BUG=0
TEST=see included unit test
Review URL: http://codereview.chromium.org/5331003
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@67311 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome_frame/chrome_frame_npapi.cc')
| -rw-r--r-- | chrome_frame/chrome_frame_npapi.cc | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/chrome_frame/chrome_frame_npapi.cc b/chrome_frame/chrome_frame_npapi.cc index f3144b1..c645ee8 100644 --- a/chrome_frame/chrome_frame_npapi.cc +++ b/chrome_frame/chrome_frame_npapi.cc @@ -55,6 +55,7 @@ const NPUTF8* ChromeFrameNPAPI::plugin_property_identifier_names_[] = { "onprivatemessage", "usechromenetwork", "onclose", + "sessionid", }; const NPUTF8* ChromeFrameNPAPI::plugin_method_identifier_names_[] = { @@ -667,6 +668,14 @@ bool ChromeFrameNPAPI::GetProperty(NPIdentifier name, plugin_property_identifiers_[PLUGIN_PROPERTY_USECHROMENETWORK]) { BOOLEAN_TO_NPVARIANT(automation_client_->use_chrome_network(), *variant); return true; + } else if (name == plugin_property_identifiers_[PLUGIN_PROPERTY_SESSIONID]) { + if (!is_privileged_) { + DLOG(WARNING) << "Attempt to read sessionid property while not " + "privileged"; + } else { + INT32_TO_NPVARIANT(automation_client_->GetSessionId(), *variant); + return true; + } } return false; |