diff options
Diffstat (limited to 'chrome/browser/chromeos')
9 files changed, 10 insertions, 10 deletions
diff --git a/chrome/browser/chromeos/attestation/platform_verification_flow.cc b/chrome/browser/chromeos/attestation/platform_verification_flow.cc index 132e1a7..d43f1e2 100644 --- a/chrome/browser/chromeos/attestation/platform_verification_flow.cc +++ b/chrome/browser/chromeos/attestation/platform_verification_flow.cc @@ -239,12 +239,12 @@ void PlatformVerificationFlow::OnConsentResponse( } if (consent_response == CONSENT_RESPONSE_DENY) { content::RecordAction( - content::UserMetricsAction("PlatformVerificationRejected")); + base::UserMetricsAction("PlatformVerificationRejected")); ReportError(context.callback, USER_REJECTED); return; } else if (consent_response == CONSENT_RESPONSE_ALLOW) { content::RecordAction( - content::UserMetricsAction("PlatformVerificationAccepted")); + base::UserMetricsAction("PlatformVerificationAccepted")); } } diff --git a/chrome/browser/chromeos/charger_replace/charger_replacement_dialog.cc b/chrome/browser/chromeos/charger_replace/charger_replacement_dialog.cc index 9d1bfe8..d255085 100644 --- a/chrome/browser/chromeos/charger_replace/charger_replacement_dialog.cc +++ b/chrome/browser/chromeos/charger_replace/charger_replacement_dialog.cc @@ -70,7 +70,7 @@ void ChargerReplacementDialog::SetFocusOnChargerDialogIfVisible() { void ChargerReplacementDialog::Show() { content::RecordAction( - content::UserMetricsAction("ShowChargerReplacementDialog")); + base::UserMetricsAction("ShowChargerReplacementDialog")); is_window_visible_ = true; // We show the dialog for the active user, so that the dialog will get diff --git a/chrome/browser/chromeos/external_metrics.cc b/chrome/browser/chromeos/external_metrics.cc index c1e0415..27b90ee 100644 --- a/chrome/browser/chromeos/external_metrics.cc +++ b/chrome/browser/chromeos/external_metrics.cc @@ -32,8 +32,8 @@ #include "content/public/browser/browser_thread.h" #include "content/public/browser/user_metrics.h" +using base::UserMetricsAction; using content::BrowserThread; -using content::UserMetricsAction; namespace chromeos { diff --git a/chrome/browser/chromeos/file_manager/open_util.cc b/chrome/browser/chromeos/file_manager/open_util.cc index 86952cb..279186c 100644 --- a/chrome/browser/chromeos/file_manager/open_util.cc +++ b/chrome/browser/chromeos/file_manager/open_util.cc @@ -38,9 +38,9 @@ #include "webkit/browser/fileapi/file_system_operation_runner.h" #include "webkit/browser/fileapi/file_system_url.h" +using base::UserMetricsAction; using content::BrowserContext; using content::BrowserThread; -using content::UserMetricsAction; using extensions::Extension; using extensions::app_file_handler_util::FindFileHandlersForFiles; using extensions::app_file_handler_util::PathAndMimeTypeSet; diff --git a/chrome/browser/chromeos/locale_change_guard.cc b/chrome/browser/chromeos/locale_change_guard.cc index 034ce49..32e58dc 100644 --- a/chrome/browser/chromeos/locale_change_guard.cc +++ b/chrome/browser/chromeos/locale_change_guard.cc @@ -29,7 +29,7 @@ #include "grit/theme_resources.h" #include "ui/base/l10n/l10n_util.h" -using content::UserMetricsAction; +using base::UserMetricsAction; using content::WebContents; namespace chromeos { diff --git a/chrome/browser/chromeos/login/existing_user_controller.cc b/chrome/browser/chromeos/login/existing_user_controller.cc index 5cd162c..013756a 100644 --- a/chrome/browser/chromeos/login/existing_user_controller.cc +++ b/chrome/browser/chromeos/login/existing_user_controller.cc @@ -303,7 +303,7 @@ void ExistingUserController::CancelPasswordChangedFlow() { } void ExistingUserController::CreateAccount() { - content::RecordAction(content::UserMetricsAction("Login.CreateAccount")); + content::RecordAction(base::UserMetricsAction("Login.CreateAccount")); guest_mode_url_ = google_util::AppendGoogleLocaleParam(GURL(kCreateAccountURL)); LoginAsGuest(); diff --git a/chrome/browser/chromeos/login/login_performer.cc b/chrome/browser/chromeos/login/login_performer.cc index 0604adf9..4866d9e 100644 --- a/chrome/browser/chromeos/login/login_performer.cc +++ b/chrome/browser/chromeos/login/login_performer.cc @@ -42,8 +42,8 @@ #include "ui/base/l10n/l10n_util.h" #include "ui/base/resource/resource_bundle.h" +using base::UserMetricsAction; using content::BrowserThread; -using content::UserMetricsAction; namespace chromeos { diff --git a/chrome/browser/chromeos/login/managed/locally_managed_user_creation_controller.cc b/chrome/browser/chromeos/login/managed/locally_managed_user_creation_controller.cc index 1fa75b6..c88738b 100644 --- a/chrome/browser/chromeos/login/managed/locally_managed_user_creation_controller.cc +++ b/chrome/browser/chromeos/login/managed/locally_managed_user_creation_controller.cc @@ -286,7 +286,7 @@ void LocallyManagedUserCreationController::OnManagedUserFilesStored( timeout_timer_.Stop(); content::RecordAction( - content::UserMetricsAction("ManagedMode_LocallyManagedUserCreated")); + base::UserMetricsAction("ManagedMode_LocallyManagedUserCreated")); if (!success) { if (consumer_) diff --git a/chrome/browser/chromeos/login/screen_locker.cc b/chrome/browser/chromeos/login/screen_locker.cc index 33a0ee3..1c086b4 100644 --- a/chrome/browser/chromeos/login/screen_locker.cc +++ b/chrome/browser/chromeos/login/screen_locker.cc @@ -54,8 +54,8 @@ #include "ui/gfx/image/image.h" #include "url/gurl.h" +using base::UserMetricsAction; using content::BrowserThread; -using content::UserMetricsAction; namespace { |