diff options
| author | alekseys@chromium.org <alekseys@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-12-02 20:32:48 +0000 |
|---|---|---|
| committer | alekseys@chromium.org <alekseys@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-12-02 20:32:48 +0000 |
| commit | 8d893510a0062ef20a6174bd58335a2b11c52b03 (patch) | |
| tree | 22f21e2cfa90a266476964641316d575844b3ed7 | |
| parent | bee065fe0345ede634009e6ea1051d2040c24524 (diff) | |
| download | chromium_src-8d893510a0062ef20a6174bd58335a2b11c52b03.zip chromium_src-8d893510a0062ef20a6174bd58335a2b11c52b03.tar.gz chromium_src-8d893510a0062ef20a6174bd58335a2b11c52b03.tar.bz2 | |
Silence superfluous DCHECK in BrowserHelperObject::HandleNavigateComplete
for the pages containing non-HTML frames.
BUG=64986
TEST=DCHECK should not fire on pages containing non-HTML frames.
Review URL: http://codereview.chromium.org/5515001
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@68063 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | ceee/ie/plugin/bho/browser_helper_object.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/ceee/ie/plugin/bho/browser_helper_object.cc b/ceee/ie/plugin/bho/browser_helper_object.cc index 6be1d89..634facd 100644 --- a/ceee/ie/plugin/bho/browser_helper_object.cc +++ b/ceee/ie/plugin/bho/browser_helper_object.cc @@ -1155,10 +1155,10 @@ void BrowserHelperObject::HandleNavigateComplete(IWebBrowser2* webbrowser, if (FAILED(GetBrowserHandler(webbrowser, handler.Receive()))) { hr = AttachBrowserHandler(webbrowser, handler.Receive()); - DCHECK(SUCCEEDED(hr)) + DCHECK(SUCCEEDED(hr) || E_DOCUMENT_NOT_MSHTML == hr) << "Error when trying to attach a handler to the web browser " << com::LogHr(hr); - LOG_IF(INFO, S_FALSE == hr) << + LOG_IF(INFO, S_FALSE == hr || E_DOCUMENT_NOT_MSHTML == hr) << "Decided not to attach a handler to a frame with " << url; } |