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

chrome/browser/ui/views/tabs/default_tab_drag_controller.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/tabs/default_tab_drag_controller.h"
 
 #include <math.h>
 #include <set>
 
 #include "base/callback.h"
 #include "base/i18n/rtl.h"
 #include "chrome/browser/extensions/extension_function_dispatcher.h"
 #include "chrome/browser/tabs/tab_strip_model.h"
 #include "chrome/browser/ui/app_modal_dialogs/message_box_handler.h"
 #include "chrome/browser/ui/browser_window.h"
 #include "chrome/browser/ui/views/frame/browser_view.h"
 #include "chrome/browser/ui/views/tabs/base_tab.h"
 #include "chrome/browser/ui/views/tabs/base_tab_strip.h"
 #include "chrome/browser/ui/views/tabs/browser_tab_strip_controller.h"
 #include "chrome/browser/ui/views/tabs/dragged_tab_view.h"
 #include "chrome/browser/ui/views/tabs/native_view_photobooth.h"
 #include "chrome/browser/ui/views/tabs/tab.h"
 #include "chrome/browser/ui/views/tabs/tab_strip.h"
 #include "content/browser/tab_contents/tab_contents.h"
-#include "content/browser/user_metrics.h"
 #include "content/public/browser/notification_details.h"
 #include "content/public/browser/notification_source.h"
 #include "content/public/browser/notification_types.h"
+#include "content/public/browser/user_metrics.h"
 #include "grit/theme_resources.h"
 #include "third_party/skia/include/core/SkBitmap.h"
 #include "ui/base/animation/animation.h"
 #include "ui/base/animation/animation_delegate.h"
 #include "ui/base/animation/slide_animation.h"
 #include "ui/base/events.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/gfx/canvas_skia.h"
 #include "ui/gfx/screen.h"
 #include "ui/views/events/event.h"
 #include "ui/views/widget/widget.h"
 
 #if defined(TOOLKIT_USES_GTK)
 #include <gdk/gdk.h>  // NOLINT
 #include <gdk/gdkkeysyms.h>  // NOLINT
 #endif
 
+using content::UserMetricsAction;
+
 static const int kHorizontalMoveThreshold = 16;  // Pixels.
 
 // If non-null there is a drag underway.
 static DefaultTabDragController* instance_ = NULL;
 
 namespace {
 
 // Delay, in ms, during dragging before we bring a window to front.
 const int kBringToFrontDelay = 750;
 
@@ skipping 1114 matching lines @@
 void DefaultTabDragController::CompleteDrag() {
   DCHECK(started_drag_);
 
   if (attached_tabstrip_) {
     attached_tabstrip_->StoppedDraggingTabs(
         GetTabsMatchingDraggedContents(attached_tabstrip_));
   } else {
     if (dock_info_.type() != DockInfo::NONE) {
       switch (dock_info_.type()) {
         case DockInfo::LEFT_OF_WINDOW:
-          UserMetrics::RecordAction(UserMetricsAction("DockingWindow_Left"));
+          content::RecordAction(UserMetricsAction("DockingWindow_Left"));
           break;
 
         case DockInfo::RIGHT_OF_WINDOW:
-          UserMetrics::RecordAction(UserMetricsAction("DockingWindow_Right"));
+          content::RecordAction(UserMetricsAction("DockingWindow_Right"));
           break;
 
         case DockInfo::BOTTOM_OF_WINDOW:
-          UserMetrics::RecordAction(UserMetricsAction("DockingWindow_Bottom"));
+          content::RecordAction(UserMetricsAction("DockingWindow_Bottom"));
           break;
 
         case DockInfo::TOP_OF_WINDOW:
-          UserMetrics::RecordAction(UserMetricsAction("DockingWindow_Top"));
+          content::RecordAction(UserMetricsAction("DockingWindow_Top"));
           break;
 
         case DockInfo::MAXIMIZE:
-          UserMetrics::RecordAction(
+          content::RecordAction(
               UserMetricsAction("DockingWindow_Maximize"));
           break;
 
         case DockInfo::LEFT_HALF:
-          UserMetrics::RecordAction(
+          content::RecordAction(
               UserMetricsAction("DockingWindow_LeftHalf"));
           break;
 
         case DockInfo::RIGHT_HALF:
-          UserMetrics::RecordAction(
+          content::RecordAction(
               UserMetricsAction("DockingWindow_RightHalf"));
           break;
 
         case DockInfo::BOTTOM_HALF:
-          UserMetrics::RecordAction(
+          content::RecordAction(
               UserMetricsAction("DockingWindow_BottomHalf"));
           break;
 
         default:
           NOTREACHED();
           break;
       }
     }
     // Compel the model to construct a new window for the detached TabContents.
     views::Widget* widget = source_tabstrip_->GetWidget();
@@ skipping 188 matching lines @@
   controller->Init(source_tabstrip, source_tab, tabs, mouse_offset,
                    source_tab_offset, initial_selection_model);
   return controller;
 }
 
 // static
 bool TabDragController::IsAttachedTo(BaseTabStrip* tab_strip) {
   return instance_ && instance_->active()&&
       instance_->attached_tabstrip() == tab_strip;
 }