diff options
| author | stoyan@chromium.org <stoyan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-03-24 17:29:22 +0000 |
|---|---|---|
| committer | stoyan@chromium.org <stoyan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-03-24 17:29:22 +0000 |
| commit | 7c712c995e0024a0d4efe2da62007d87c457b1d0 (patch) | |
| tree | cdcd6605ad47c9c71d87ee8c185b80b84245ce2a /chrome_frame/urlmon_moniker.cc | |
| parent | 3d23353462277ab1cae323570207f5211a7dfe5d (diff) | |
| download | chromium_src-7c712c995e0024a0d4efe2da62007d87c457b1d0.zip chromium_src-7c712c995e0024a0d4efe2da62007d87c457b1d0.tar.gz chromium_src-7c712c995e0024a0d4efe2da62007d87c457b1d0.tar.bz2 | |
Make (&CGID_Explorer, SBCMDID_MIXEDZONE) command more sane.
Add test for navigation to sites in restricted sites zone.
Review URL: http://codereview.chromium.org/1217001
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@42484 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome_frame/urlmon_moniker.cc')
| -rw-r--r-- | chrome_frame/urlmon_moniker.cc | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/chrome_frame/urlmon_moniker.cc b/chrome_frame/urlmon_moniker.cc index 0873f13..eba574e 100644 --- a/chrome_frame/urlmon_moniker.cc +++ b/chrome_frame/urlmon_moniker.cc @@ -450,9 +450,10 @@ HRESULT MonikerPatch::BindToObject(IMoniker_BindToObject_Fn original, hr = persist_moniker.QueryFrom(cf_doc); DCHECK(SUCCEEDED(hr)); hr = persist_moniker->Load(TRUE, me, bind_ctx, STGM_READ); - DCHECK(SUCCEEDED(hr)); - hr = persist_moniker.QueryInterface(iid, obj); - DCHECK(SUCCEEDED(hr)); + if (SUCCEEDED(hr)) { + hr = persist_moniker.QueryInterface(iid, obj); + DCHECK(SUCCEEDED(hr)); + } } else { DLOG(INFO) << " creating callback object"; CComObject<CFUrlmonBindStatusCallback>* callback = NULL; |