diff options
| author | davemoore@chromium.org <davemoore@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-03-07 18:36:30 +0000 |
|---|---|---|
| committer | davemoore@chromium.org <davemoore@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-03-07 18:36:30 +0000 |
| commit | 5f9b002aea3fea5d916e1d6735c827f034fda921 (patch) | |
| tree | 33a508e9f8119129b56d2655cc1cfd8a1c39439a /chrome/browser | |
| parent | 9b4a6f77f5d712814801e515c47713bc59051509 (diff) | |
| download | chromium_src-5f9b002aea3fea5d916e1d6735c827f034fda921.zip chromium_src-5f9b002aea3fea5d916e1d6735c827f034fda921.tar.gz chromium_src-5f9b002aea3fea5d916e1d6735c827f034fda921.tar.bz2 | |
Check for null RenderWidgetHost
Also report restore times to UMA
BUG=71566
TEST=None
Review URL: http://codereview.chromium.org/6621036
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@77159 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser')
| -rw-r--r-- | chrome/browser/sessions/session_restore.cc | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/chrome/browser/sessions/session_restore.cc b/chrome/browser/sessions/session_restore.cc index 14d06a0..788aeaf 100644 --- a/chrome/browser/sessions/session_restore.cc +++ b/chrome/browser/sessions/session_restore.cc @@ -267,8 +267,9 @@ void TabLoader::Observe(NotificationType type, case NotificationType::TAB_CONTENTS_DESTROYED: { TabContents* tab_contents = Source<TabContents>(source).ptr(); if (!got_first_paint_) { - render_widget_hosts_loading_.erase( - tab_contents->GetRenderWidgetHostView()->GetRenderWidgetHost()); + RenderWidgetHost* render_widget_host = + GetRenderWidgetHost(&tab_contents->controller()); + render_widget_hosts_loading_.erase(render_widget_host); } HandleTabClosedOrLoaded(&tab_contents->controller()); break; @@ -289,7 +290,7 @@ void TabLoader::Observe(NotificationType type, got_first_paint_ = true; base::TimeDelta time_to_paint = base::TimeTicks::Now() - restore_started_; - HISTOGRAM_CUSTOM_TIMES( + UMA_HISTOGRAM_CUSTOM_TIMES( "SessionRestore.FirstTabPainted", time_to_paint, base::TimeDelta::FromMilliseconds(10), @@ -305,7 +306,7 @@ void TabLoader::Observe(NotificationType type, base::TimeDelta::FromMilliseconds(10), base::TimeDelta::FromSeconds(100), 100, - base::Histogram::kNoFlags); + base::Histogram::kUmaTargetedHistogramFlag); counter_for_count->AddTime(time_to_paint); } else if (render_widget_hosts_loading_.find(render_widget_host) == render_widget_hosts_loading_.end()) { @@ -378,7 +379,7 @@ void TabLoader::HandleTabClosedOrLoaded(NavigationController* tab) { if (tabs_loading_.empty() && tabs_to_load_.empty()) { base::TimeDelta time_to_load = base::TimeTicks::Now() - restore_started_; - HISTOGRAM_CUSTOM_TIMES( + UMA_HISTOGRAM_CUSTOM_TIMES( "SessionRestore.AllTabsLoaded", time_to_load, base::TimeDelta::FromMilliseconds(10), @@ -393,7 +394,7 @@ void TabLoader::HandleTabClosedOrLoaded(NavigationController* tab) { base::TimeDelta::FromMilliseconds(10), base::TimeDelta::FromSeconds(100), 100, - base::Histogram::kNoFlags); + base::Histogram::kUmaTargetedHistogramFlag); counter_for_count->AddTime(time_to_load); } } |