diff options
| author | glen@chromium.org <glen@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-03-01 19:59:35 +0000 |
|---|---|---|
| committer | glen@chromium.org <glen@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-03-01 19:59:35 +0000 |
| commit | 4c99a9f02c090254bc4ef8bca512428d24e28bd5 (patch) | |
| tree | 0e7b4e4ec2be8938d44c17ff23b2549b439eb46d /chrome | |
| parent | fe6064373414f01d180a84b2d3473d5032523174 (diff) | |
| download | chromium_src-4c99a9f02c090254bc4ef8bca512428d24e28bd5.zip chromium_src-4c99a9f02c090254bc4ef8bca512428d24e28bd5.tar.gz chromium_src-4c99a9f02c090254bc4ef8bca512428d24e28bd5.tar.bz2 | |
Fix crash; dom_ui_ is destroyed by LoadURL.
BUG=8158
Review URL: http://codereview.chromium.org/27285
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@10689 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome')
| -rw-r--r-- | chrome/browser/dom_ui/new_tab_ui.cc | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/chrome/browser/dom_ui/new_tab_ui.cc b/chrome/browser/dom_ui/new_tab_ui.cc index 189f703..764fd36 100644 --- a/chrome/browser/dom_ui/new_tab_ui.cc +++ b/chrome/browser/dom_ui/new_tab_ui.cc @@ -719,9 +719,10 @@ void HistoryHandler::HandleShowHistoryPage(const Value*) { if (controller) { #if defined(OS_WIN) // TODO(port): include this once history is converted to HTML - controller->LoadURL(HistoryUI::GetBaseURL(), GURL(), PageTransition::LINK); UserMetrics::RecordAction(L"NTP_ShowHistory", dom_ui_->get_profile()); + controller->LoadURL(HistoryUI::GetBaseURL(), GURL(), PageTransition::LINK); + // We are deleted by LoadURL, so do not call anything else. #else NOTIMPLEMENTED(); #endif @@ -749,6 +750,7 @@ void HistoryHandler::HandleSearchHistoryPage(const Value* content) { HistoryUI::GetHistoryURLWithSearchText(wstring_value), GURL(), PageTransition::LINK); + // We are deleted by LoadURL, so do not call anything else. #else NOTIMPLEMENTED(); #endif |