| Index: chrome/browser/ui/views/conflicting_module_view_win.cc
|
| diff --git a/chrome/browser/ui/views/conflicting_module_view_win.cc b/chrome/browser/ui/views/conflicting_module_view_win.cc
|
| index 6789c82bb6358cda0515ab83f9ad4d8631cc99e2..f4b463b241fa6ced0251e7e1e6eb5e76daedff3f 100644
|
| --- a/chrome/browser/ui/views/conflicting_module_view_win.cc
|
| +++ b/chrome/browser/ui/views/conflicting_module_view_win.cc
|
| @@ -5,6 +5,7 @@
|
| #include "chrome/browser/ui/views/conflicting_module_view_win.h"
|
|
|
| #include "base/metrics/histogram_macros.h"
|
| +#include "base/metrics/user_metrics.h"
|
| #include "chrome/browser/chrome_notification_types.h"
|
| #include "chrome/browser/profiles/profile.h"
|
| #include "chrome/browser/ui/browser.h"
|
| @@ -16,7 +17,6 @@
|
| #include "chrome/grit/theme_resources.h"
|
| #include "components/strings/grit/components_strings.h"
|
| #include "content/public/browser/notification_service.h"
|
| -#include "content/public/browser/user_metrics.h"
|
| #include "ui/accessibility/ax_node_data.h"
|
| #include "ui/base/l10n/l10n_util.h"
|
| #include "ui/base/resource/resource_bundle.h"
|
| @@ -110,7 +110,7 @@ void ConflictingModuleView::ShowBubble() {
|
|
|
| void ConflictingModuleView::OnWidgetClosing(views::Widget* widget) {
|
| views::BubbleDialogDelegateView::OnWidgetClosing(widget);
|
| - content::RecordAction(
|
| + base::RecordAction(
|
| UserMetricsAction("ConflictingModuleNotificationDismissed"));
|
| }
|
|
|
| @@ -150,8 +150,7 @@ void ConflictingModuleView::Init() {
|
| IDS_CONFLICTING_MODULE_BUBBLE_WIDTH_CHARS));
|
| AddChildView(explanation);
|
|
|
| - content::RecordAction(
|
| - UserMetricsAction("ConflictingModuleNotificationShown"));
|
| + base::RecordAction(UserMetricsAction("ConflictingModuleNotificationShown"));
|
|
|
| UMA_HISTOGRAM_ENUMERATION("ConflictingModule.UserSelection",
|
| EnumerateModulesModel::ACTION_BUBBLE_SHOWN,
|
|
|