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

chrome/browser/ui/views/about_chrome_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/about_chrome_view.h"
 
 #if defined(OS_WIN)
 #include <commdlg.h>
 #endif  // defined(OS_WIN)
 
 #include <algorithm>
 #include <vector>
 
 #include "base/callback.h"
 #include "base/i18n/rtl.h"
 #include "base/string_number_conversions.h"
 #include "base/threading/thread_restrictions.h"
 #include "base/utf_string_conversions.h"
 #include "base/win/windows_version.h"
 #include "chrome/browser/google/google_util.h"
 #include "chrome/browser/prefs/pref_service.h"
 #include "chrome/browser/ui/browser_list.h"
 #include "chrome/browser/ui/dialog_style.h"
 #include "chrome/browser/ui/views/window.h"
 #include "chrome/common/chrome_constants.h"
 #include "chrome/common/chrome_version_info.h"
 #include "chrome/common/url_constants.h"
 #include "chrome/installer/util/browser_distribution.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/l10n/l10n_util.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/gfx/canvas.h"
 #include "ui/gfx/color_utils.h"
 #include "ui/views/controls/button/text_button.h"
 #include "ui/views/controls/link.h"
 #include "ui/views/controls/textfield/textfield.h"
 #include "ui/views/controls/throbber.h"
 #include "ui/views/layout/layout_constants.h"
 #include "ui/views/view_text_utils.h"
 #include "ui/views/widget/widget.h"
 #include "webkit/glue/webkit_glue.h"
 
 #if defined(OS_WIN)
 #include "base/win/win_util.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/ui/views/restart_message_box.h"
 #include "chrome/installer/util/install_util.h"
 #endif  // defined(OS_WIN)
 
+using content::UserMetricsAction;
+
 // The amount of vertical space separating the error label at the bottom from
 // the rest of the text.
 static const int kErrorLabelVerticalSpacing = 15;  // Pixels.
 
 namespace {
 // These are used as placeholder text around the links in the text in the about
 // dialog.
 string16 kBeginLink() {
   return ASCIIToUTF16("BEGIN_LINK");
 }
@@ skipping 592 matching lines @@
   return;
 #endif
   bool show_success_indicator = false;
   bool show_update_available_indicator = false;
   bool show_timeout_indicator = false;
   bool show_throbber = false;
   bool show_update_label = true;  // Always visible, except at start.
 
   switch (result) {
     case UPGRADE_STARTED:
-      UserMetrics::RecordAction(UserMetricsAction("Upgrade_Started"));
+      content::RecordAction(UserMetricsAction("Upgrade_Started"));
       show_throbber = true;
       update_label_.SetText(
           UTF16ToWide(l10n_util::GetStringUTF16(IDS_UPGRADE_STARTED)));
       break;
     case UPGRADE_CHECK_STARTED:
-      UserMetrics::RecordAction(UserMetricsAction("UpgradeCheck_Started"));
+      content::RecordAction(UserMetricsAction("UpgradeCheck_Started"));
       show_throbber = true;
       update_label_.SetText(
           UTF16ToWide(l10n_util::GetStringUTF16(IDS_UPGRADE_CHECK_STARTED)));
       break;
     case UPGRADE_IS_AVAILABLE:
-      UserMetrics::RecordAction(
+      content::RecordAction(
           UserMetricsAction("UpgradeCheck_UpgradeIsAvailable"));
       DCHECK(!google_updater_);  // Should have been nulled out already.
       google_updater_ = new GoogleUpdate();
       google_updater_->set_status_listener(this);
       UpdateStatus(UPGRADE_STARTED, GOOGLE_UPDATE_NO_ERROR, string16());
       // CheckForUpdate(true,...) means perform upgrade if new version found.
       google_updater_->CheckForUpdate(true, GetWidget());
       // TODO(seanparent): Need to see if this code needs to change to
       // force a machine restart.
       return;
@@ skipping 12 matching lines @@
       scoped_ptr<Version> installed_version(
           InstallUtil::GetChromeVersion(dist, false));
       if (!installed_version.get()) {
         // User-level Chrome is not installed, check system-level.
         installed_version.reset(InstallUtil::GetChromeVersion(dist, true));
       }
       scoped_ptr<Version> running_version(
           Version::GetVersionFromString(version_info.Version()));
       if (!installed_version.get() ||
           (installed_version->CompareTo(*running_version) <= 0)) {
-        UserMetrics::RecordAction(
+        content::RecordAction(
             UserMetricsAction("UpgradeCheck_AlreadyUpToDate"));
         string16 update_label_text = l10n_util::GetStringFUTF16(
             IDS_UPGRADE_ALREADY_UP_TO_DATE,
             l10n_util::GetStringUTF16(IDS_PRODUCT_NAME),
             ASCIIToUTF16(version_info.Version()));
         if (base::i18n::IsRTL()) {
           update_label_text.push_back(
               static_cast<wchar_t>(base::i18n::kLeftToRightMark));
         }
         update_label_.SetText(update_label_text);
         show_success_indicator = true;
         break;
       }
       // No break here as we want to notify user about upgrade if there is one.
     }
     case UPGRADE_SUCCESSFUL: {
       if (result == UPGRADE_ALREADY_UP_TO_DATE)
-        UserMetrics::RecordAction(
+        content::RecordAction(
             UserMetricsAction("UpgradeCheck_AlreadyUpgraded"));
       else
-        UserMetrics::RecordAction(UserMetricsAction("UpgradeCheck_Upgraded"));
+        content::RecordAction(UserMetricsAction("UpgradeCheck_Upgraded"));
       restart_button_visible_ = true;
       const string16& update_string =
           UTF16ToWide(l10n_util::GetStringFUTF16(
               IDS_UPGRADE_SUCCESSFUL_RELAUNCH,
               l10n_util::GetStringUTF16(IDS_PRODUCT_NAME)));
       update_label_.SetText(update_string);
       show_success_indicator = true;
       break;
     }
     case UPGRADE_ERROR: {
-      UserMetrics::RecordAction(UserMetricsAction("UpgradeCheck_Error"));
+      content::RecordAction(UserMetricsAction("UpgradeCheck_Error"));
       if (!error_message.empty() && error_label_) {
         error_label_->SetText(
             l10n_util::GetStringFUTF16(IDS_ABOUT_BOX_ERROR_DURING_UPDATE_CHECK,
                 error_message));
         int added_height = EnlargeWindowSizeIfNeeded();
         dialog_dimensions_.set_height(dialog_dimensions_.height() +
                                       added_height);
       }
       restart_button_visible_ = false;
       if (error_code != GOOGLE_UPDATE_DISABLED_BY_POLICY) {
@@ skipping 39 matching lines @@
   int height = error_label_->GetHeightForWidth(
       dialog_dimensions_.width() - (2 * views::kPanelHorizMargin)) +
           views::kRelatedControlVerticalSpacing;
   window_rect.set_height(window_rect.height() + height);
   GetWidget()->SetBounds(window_rect);
 
   return height;
 }
 
 #endif