summaryrefslogtreecommitdiffstats
path: root/chrome_frame/chrome_active_document.cc
diff options
context:
space:
mode:
authoramit@chromium.org <amit@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-03-19 07:09:09 +0000
committeramit@chromium.org <amit@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-03-19 07:09:09 +0000
commit014c0330c5da4e22329973a741ddae1d1cfdb8bc (patch)
treee356d05283bc00f4901c97a04667d07494b703a1 /chrome_frame/chrome_active_document.cc
parent34fda3e29292d492c9853b7f352569f2a3a39b2e (diff)
downloadchromium_src-014c0330c5da4e22329973a741ddae1d1cfdb8bc.zip
chromium_src-014c0330c5da4e22329973a741ddae1d1cfdb8bc.tar.gz
chromium_src-014c0330c5da4e22329973a741ddae1d1cfdb8bc.tar.bz2
Fix top crashers in the latest build.
Fixes crashes due to NavigationManager instance being NULL. TBR=tommi BUG=38602,38603 Review URL: http://codereview.chromium.org/1100006 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@42083 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome_frame/chrome_active_document.cc')
-rw-r--r--chrome_frame/chrome_active_document.cc3
1 files changed, 2 insertions, 1 deletions
diff --git a/chrome_frame/chrome_active_document.cc b/chrome_frame/chrome_active_document.cc
index a0bcae4..3c10d15 100644
--- a/chrome_frame/chrome_active_document.cc
+++ b/chrome_frame/chrome_active_document.cc
@@ -232,11 +232,12 @@ STDMETHODIMP ChromeActiveDocument::Load(BOOL fully_avalable,
moniker_name, bind_context,
mgr ? mgr->original_url_with_fragment() : std::wstring()));
+ scoped_refptr<RequestData> data;
if (mgr) {
mgr->set_original_url_with_fragment(L"");
+ data = mgr->GetActiveRequestData(url.c_str());
}
- scoped_refptr<RequestData> data(mgr->GetActiveRequestData(url.c_str()));
DLOG_IF(INFO, data) << "Got active request data";
DLOG_IF(WARNING, data.get() == NULL) << "NO active request data";