| Index: chrome/browser/ui/views/toolbar/toolbar_view.cc
|
| diff --git a/chrome/browser/ui/views/toolbar/toolbar_view.cc b/chrome/browser/ui/views/toolbar/toolbar_view.cc
|
| index 03806e5f2d516ff323c04a29f0808fa6bce093cf..240ce199f77f8361286311a32ae0ca38ee1980d1 100644
|
| --- a/chrome/browser/ui/views/toolbar/toolbar_view.cc
|
| +++ b/chrome/browser/ui/views/toolbar/toolbar_view.cc
|
| @@ -8,6 +8,7 @@
|
|
|
| #include "base/command_line.h"
|
| #include "base/i18n/number_formatting.h"
|
| +#include "base/metrics/user_metrics.h"
|
| #include "base/strings/utf_string_conversions.h"
|
| #include "base/trace_event/trace_event.h"
|
| #include "build/build_config.h"
|
| @@ -56,7 +57,6 @@
|
| #include "content/public/browser/browser_accessibility_state.h"
|
| #include "content/public/browser/notification_service.h"
|
| #include "content/public/browser/render_view_host.h"
|
| -#include "content/public/browser/user_metrics.h"
|
| #include "content/public/browser/web_contents.h"
|
| #include "ui/accessibility/ax_node_data.h"
|
| #include "ui/base/l10n/l10n_util.h"
|
| @@ -682,7 +682,7 @@ void ToolbarView::UpdateSeverity(AppMenuIconController::IconType type,
|
|
|
| if (type == AppMenuIconController::IconType::INCOMPATIBILITY_WARNING) {
|
| if (!was_showing) {
|
| - content::RecordAction(UserMetricsAction("ConflictBadge"));
|
| + base::RecordAction(UserMetricsAction("ConflictBadge"));
|
| #if defined(OS_WIN)
|
| ConflictingModuleView::MaybeShow(browser_, app_menu_button_);
|
| #endif
|
|
|