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

chrome/browser/chromeos/login/screen_locker_views.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/chromeos/login/screen_locker_views.h"
 
 #include <X11/extensions/XTest.h>
 #include <X11/keysym.h>
 #include <gdk/gdkkeysyms.h>
 #include <gdk/gdkx.h>
 
 // Evil hack to undo X11 evil #define.
 #undef None
 #undef Status
 
 #include "base/command_line.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/chromeos/login/background_view.h"
 #include "chrome/browser/chromeos/login/login_performer.h"
 #include "chrome/browser/chromeos/login/message_bubble.h"
 #include "chrome/browser/chromeos/login/screen_lock_view.h"
 #include "chrome/browser/chromeos/login/screen_locker.h"
 #include "chrome/browser/chromeos/login/shutdown_button.h"
 #include "chrome/browser/chromeos/status/status_area_view_chromeos.h"
 #include "chrome/browser/chromeos/view_ids.h"
 #include "chrome/browser/prefs/pref_service.h"
 #include "chrome/browser/ui/views/window.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/pref_names.h"
-#include "content/browser/user_metrics.h"
+#include "content/public/browser/user_metrics.h"
 #include "grit/theme_resources.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/base/x/x11_util.h"
 #include "ui/gfx/screen.h"
 #include "ui/views/controls/textfield/textfield.h"
 
 #if defined(TOOLKIT_USES_GTK)
 #include "chrome/browser/chromeos/legacy_window_manager/wm_ipc.h"
 #include "ui/views/widget/native_widget_gtk.h"
 #endif
 
+using content::UserMetricsAction;
+
 namespace {
 
 // The active ScreenLockerDelegate.
 chromeos::ScreenLockerViews* screen_locker_view_ = NULL;
 
 // The maximum duration for which locker should try to grab the keyboard and
 // mouse and its interval for regrabbing on failure.
 const int kMaxGrabFailureSec = 30;
 const int64 kRetryGrabIntervalMs = 500;
 
@@ skipping 642 matching lines @@
 void ScreenLockerViews::OnGrabInputs() {
   DVLOG(1) << "OnGrabInputs";
   input_grabbed_ = true;
   if (drawn_)
     ScreenLockReady();
 }
 
 void ScreenLockerViews::StartScreenSaver() {
   if (!background_view_->IsScreenSaverVisible()) {
     VLOG(1) << "StartScreenSaver";
-    UserMetrics::RecordAction(
+    content::RecordAction(
         UserMetricsAction("ScreenLocker_StartScreenSaver"));
     background_view_->ShowScreenSaver();
     if (screen_lock_view_) {
       screen_lock_view_->SetEnabled(false);
       screen_lock_view_->SetVisible(false);
     }
     screen_locker_->ClearErrors();
   }
 }
 
@@ skipping 186 matching lines @@
 #if defined(TOOLKIT_USES_GTK)
   WmIpc::Message msg;
   WmIpc::instance()->DecodeMessage(*event, &msg);
   if (msg.type() == WM_IPC_MESSAGE_CHROME_NOTIFY_SCREEN_REDRAWN_FOR_LOCK) {
     OnWindowManagerReady();
   }
 #endif
 }
 
 }  // namespace chromeos