From ed1bb720731ea7c7644c208da970f0609a7e3b62 Mon Sep 17 00:00:00 2001 From: "jeremy@chromium.org" Date: Fri, 21 Jun 2013 05:16:44 +0000 Subject: Revert Fast tab closure and dependent CL Revert r205149 (Fast tab closure) and dependent CL r207181 (Move histograms and supporting code that don't belong in content out) since it breaks a bunch of systems. Mechanical revert of problematic CLs, setting NOTRY so we can land this in the face of flaky bots. BUG=142458,156896,249289,246999,246634,248998,250863 TBR=sky@chromium.org,joi@chromium.org,jam@chromium.org NOTRY=True Review URL: https://chromiumcodereview.appspot.com/17487002 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@207712 0039d316-1c4b-4281-b951-d872f2087c98 --- chrome/browser/ui/webui/metrics_handler.cc | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) (limited to 'chrome/browser/ui/webui/metrics_handler.cc') diff --git a/chrome/browser/ui/webui/metrics_handler.cc b/chrome/browser/ui/webui/metrics_handler.cc index 9394e07..b57ce0f 100644 --- a/chrome/browser/ui/webui/metrics_handler.cc +++ b/chrome/browser/ui/webui/metrics_handler.cc @@ -11,7 +11,6 @@ #include "base/strings/utf_string_conversions.h" #include "base/values.h" #include "chrome/browser/metrics/metric_event_duration_details.h" -#include "chrome/browser/ui/tab_contents/core_tab_helper.h" #include "chrome/common/chrome_notification_types.h" #include "content/public/browser/notification_service.h" #include "content/public/browser/user_metrics.h" @@ -83,12 +82,10 @@ void MetricsHandler::HandleLogEventTime(const ListValue* args) { // Not all new tab pages get timed. In those cases, we don't have a // new_tab_start_time_. - CoreTabHelper* core_tab_helper = CoreTabHelper::FromWebContents(tab); - if (core_tab_helper->new_tab_start_time().is_null()) + if (tab->GetNewTabStartTime().is_null()) return; - base::TimeDelta duration = - base::TimeTicks::Now() - core_tab_helper->new_tab_start_time(); + base::TimeDelta duration = base::TimeTicks::Now() - tab->GetNewTabStartTime(); MetricEventDurationDetails details(event_name, static_cast(duration.InMilliseconds())); @@ -99,8 +96,7 @@ void MetricsHandler::HandleLogEventTime(const ListValue* args) { } else if (event_name == "Tab.NewTabOnload") { UMA_HISTOGRAM_TIMES("Tab.NewTabOnload", duration); // The new tab page has finished loading; reset it. - CoreTabHelper* core_tab_helper = CoreTabHelper::FromWebContents(tab); - core_tab_helper->set_new_tab_start_time(base::TimeTicks()); + tab->SetNewTabStartTime(base::TimeTicks()); } else { NOTREACHED(); } -- cgit v1.1