diff options
| author | ericdingle@chromium.org <ericdingle@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-11-02 21:43:18 +0000 |
|---|---|---|
| committer | ericdingle@chromium.org <ericdingle@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-11-02 21:43:18 +0000 |
| commit | e60ce9e9aa6ec26ea3df5499644c5f17a625f3aa (patch) | |
| tree | 6e5ed3e755dd6cb020475775aa668db3e9b567d6 /ceee/ie | |
| parent | 5e240672f29d5371b193ca641bab85e8fcc72e7e (diff) | |
| download | chromium_src-e60ce9e9aa6ec26ea3df5499644c5f17a625f3aa.zip chromium_src-e60ce9e9aa6ec26ea3df5499644c5f17a625f3aa.tar.gz chromium_src-e60ce9e9aa6ec26ea3df5499644c5f17a625f3aa.tar.bz2 | |
Fixed return value of CFHost::getSession()
BUG=none
TEST=none
Review URL: http://codereview.chromium.org/4262005
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@64819 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ceee/ie')
| -rw-r--r-- | ceee/ie/common/chrome_frame_host.cc | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/ceee/ie/common/chrome_frame_host.cc b/ceee/ie/common/chrome_frame_host.cc index 907b1f9..39ffd6b 100644 --- a/ceee/ie/common/chrome_frame_host.cc +++ b/ceee/ie/common/chrome_frame_host.cc @@ -165,13 +165,15 @@ HRESULT ChromeFrameHost::GetEnabledExtensions() { } } -HRESULT ChromeFrameHost::GetSessionId(int *session_id) { +HRESULT ChromeFrameHost::GetSessionId(int* session_id) { if (chrome_frame_) { CComQIPtr<IChromeFrameInternal> chrome_frame_internal_(chrome_frame_); - if (chrome_frame_internal_) + if (chrome_frame_internal_) { return chrome_frame_internal_->getSessionId(session_id); - else - return kInvalidChromeSessionId; + } else { + *session_id = kInvalidChromeSessionId; + return S_OK; + } } NOTREACHED(); return E_UNEXPECTED; |