diff options
| author | joi@chromium.org <joi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-11-24 21:30:39 +0000 |
|---|---|---|
| committer | joi@chromium.org <joi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-11-24 21:30:39 +0000 |
| commit | afa686eb44dc99087b51452a169d9b5e8cf0cd8d (patch) | |
| tree | 186c07285725a532309ba641d91f6e360f5d204e /ceee | |
| parent | 603e52dea02dcf7cb5f0d2677d40b1f6f66a1dbe (diff) | |
| download | chromium_src-afa686eb44dc99087b51452a169d9b5e8cf0cd8d.zip chromium_src-afa686eb44dc99087b51452a169d9b5e8cf0cd8d.tar.gz chromium_src-afa686eb44dc99087b51452a169d9b5e8cf0cd8d.tar.bz2 | |
Fix location of EnsureTabId and DCHECK.
BUG=none
TEST=none
Review URL: http://codereview.chromium.org/5349002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@67317 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ceee')
| -rw-r--r-- | ceee/ie/plugin/bho/browser_helper_object.cc | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/ceee/ie/plugin/bho/browser_helper_object.cc b/ceee/ie/plugin/bho/browser_helper_object.cc index cc38336..f8e2dcd 100644 --- a/ceee/ie/plugin/bho/browser_helper_object.cc +++ b/ceee/ie/plugin/bho/browser_helper_object.cc @@ -420,17 +420,17 @@ HRESULT BrowserHelperObject::InitializeChromeFrameHost() { } HRESULT BrowserHelperObject::OnCfReadyStateChanged(LONG state) { - // If EnsureTabId() returns false, the session_id isn't available. - // This means that the ExternalTab hasn't been created yet, which is certainly - // a bug. Calling this here will also ensure we call all the deferred calls if - // they haven't been called yet. - bool id_available = EnsureTabId(); - if (!id_available) { - NOTREACHED(); - return E_UNEXPECTED; - } - if (state == READYSTATE_COMPLETE) { + // If EnsureTabId() returns false, the session_id isn't available. + // This means that the ExternalTab hasn't been created yet, which + // is certainly a bug. Calling this here will also ensure we call + // all the deferred calls if they haven't been called yet. + bool id_available = EnsureTabId(); + if (!id_available) { + NOTREACHED(); + return E_UNEXPECTED; + } + extension_path_ = ceee_module_util::GetExtensionPath(); if (ceee_module_util::IsCrxOrEmpty(extension_path_) && |