Split UserMetrics into API vs. implementation. Move API to content/public.

chrome/browser/ui/views/critical_notification_bubble_view.cc

 // Copyright (c) 2011 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/ui/views/critical_notification_bubble_view.h"
 
 #include "base/string_number_conversions.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/prefs/pref_service.h"
 #include "chrome/browser/ui/browser_list.h"
 #include "chrome/browser/upgrade_detector.h"
 #include "chrome/common/pref_names.h"
-#include "content/browser/user_metrics.h"
+#include "content/public/browser/user_metrics.h"
 #include "grit/chromium_strings.h"
 #include "grit/generated_resources.h"
 #include "grit/locale_settings.h"
 #include "grit/theme_resources.h"
 #include "ui/base/accelerators/accelerator.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/views/controls/button/text_button.h"
 #include "ui/views/controls/image_view.h"
 #include "ui/views/controls/label.h"
 #include "ui/views/layout/grid_layout.h"
 #include "ui/views/layout/layout_constants.h"
 #include "ui/views/widget/widget.h"
 
+using content::UserMetricsAction;
+
 namespace {
 
 // Layout constants.
 const int kInset = 2;
 const int kImageHeadlinePadding = 4;
 const int kHeadlineMessagePadding = 4;
 const int kMessageBubblePadding = 11;
 
 // How long to give the user until auto-restart if no action is taken. The code
 // assumes this to be less than a minute.
@@ skipping 32 matching lines @@
     headline_->SetText(UTF16ToWide(
         l10n_util::GetStringFUTF16(IDS_CRITICAL_NOTIFICATION_HEADLINE_ALTERNATE,
             l10n_util::GetStringUTF16(IDS_PRODUCT_NAME))));
   }
 }
 
 void CriticalNotificationBubbleView::OnCountdown() {
   int seconds = GetRemainingTime();
   if (seconds <= 0) {
     // Time's up!
-    UserMetrics::RecordAction(
+    content::RecordAction(
         UserMetricsAction("CriticalNotification_AutoRestart"));
     refresh_timer_.Stop();
     BrowserList::AttemptRestart();
   }
 
   // Update the counter. It may seem counter-intuitive to update the message
   // after we attempt restart, but remember that shutdown may be aborted by
   // an onbeforeunload handler, leaving the bubble up when the browser should
   // have restarted (giving the user another chance).
   UpdateBubbleHeadline(seconds);
   SchedulePaint();
 }
 
 void CriticalNotificationBubbleView::ButtonPressed(
     views::Button* sender, const views::Event& event) {
   UpgradeDetector::GetInstance()->acknowledge_critical_update();
 
   if (sender == restart_button_) {
-    UserMetrics::RecordAction(
+    content::RecordAction(
         UserMetricsAction("CriticalNotification_Restart"));
     BrowserList::AttemptRestart();
   } else if (sender == dismiss_button_) {
-    UserMetrics::RecordAction(UserMetricsAction("CriticalNotification_Ignore"));
+    content::RecordAction(UserMetricsAction("CriticalNotification_Ignore"));
     // If the counter reaches 0, we set a restart flag that must be cleared if
     // the user selects, for example, "Stay on this page" during an
     // onbeforeunload handler.
     PrefService* prefs = g_browser_process->local_state();
     if (prefs->HasPrefPath(prefs::kRestartLastSessionOnShutdown))
       prefs->ClearPref(prefs::kRestartLastSessionOnShutdown);
   } else {
     NOTREACHED();
   }
 
@@ skipping 74 matching lines @@
   restart_button_->SetIsDefault(true);
   layout->AddView(restart_button_);
   dismiss_button_ = new views::NativeTextButton(this, UTF16ToWide(
       l10n_util::GetStringUTF16(IDS_CRITICAL_NOTIFICATION_DISMISS)));
   layout->AddView(dismiss_button_);
 
   refresh_timer_.Start(FROM_HERE,
       base::TimeDelta::FromMilliseconds(kRefreshBubbleEvery),
       this, &CriticalNotificationBubbleView::OnCountdown);
 
-  UserMetrics::RecordAction(UserMetricsAction("CriticalNotificationShown"));
+  content::RecordAction(UserMetricsAction("CriticalNotificationShown"));
 }