| Index: chrome/browser/permissions/permission_request_manager.cc
|
| diff --git a/chrome/browser/permissions/permission_request_manager.cc b/chrome/browser/permissions/permission_request_manager.cc
|
| index 1ed90638f96563b93e44daf7524b4e9583c078b0..9b55f72a9fff48d800e995b4526b556d5fae94aa 100644
|
| --- a/chrome/browser/permissions/permission_request_manager.cc
|
| +++ b/chrome/browser/permissions/permission_request_manager.cc
|
| @@ -8,6 +8,7 @@
|
|
|
| #include "base/command_line.h"
|
| #include "base/feature_list.h"
|
| +#include "base/metrics/user_metrics.h"
|
| #include "base/metrics/user_metrics_action.h"
|
| #include "build/build_config.h"
|
| #include "chrome/browser/permissions/permission_request.h"
|
| @@ -17,7 +18,6 @@
|
| #include "chrome/common/chrome_switches.h"
|
| #include "content/public/browser/browser_thread.h"
|
| #include "content/public/browser/navigation_handle.h"
|
| -#include "content/public/browser/user_metrics.h"
|
| #include "url/origin.h"
|
|
|
| namespace {
|
| @@ -100,7 +100,7 @@ PermissionRequestManager::~PermissionRequestManager() {
|
|
|
| void PermissionRequestManager::AddRequest(PermissionRequest* request) {
|
| // TODO(tsergeant): change the UMA to no longer mention bubbles.
|
| - content::RecordAction(base::UserMetricsAction("PermissionBubbleRequest"));
|
| + base::RecordAction(base::UserMetricsAction("PermissionBubbleRequest"));
|
|
|
| // TODO(gbillock): is there a race between an early request on a
|
| // newly-navigated page and the to-be-cleaned-up requests on the previous
|
| @@ -130,11 +130,11 @@ void PermissionRequestManager::AddRequest(PermissionRequest* request) {
|
|
|
| if (IsBubbleVisible()) {
|
| if (is_main_frame) {
|
| - content::RecordAction(
|
| + base::RecordAction(
|
| base::UserMetricsAction("PermissionBubbleRequestQueued"));
|
| queued_requests_.push_back(request);
|
| } else {
|
| - content::RecordAction(
|
| + base::RecordAction(
|
| base::UserMetricsAction("PermissionBubbleIFrameRequestQueued"));
|
| queued_frame_requests_.push_back(request);
|
| }
|
| @@ -145,7 +145,7 @@ void PermissionRequestManager::AddRequest(PermissionRequest* request) {
|
| requests_.push_back(request);
|
| accept_states_.push_back(true);
|
| } else {
|
| - content::RecordAction(
|
| + base::RecordAction(
|
| base::UserMetricsAction("PermissionBubbleIFrameRequestQueued"));
|
| queued_frame_requests_.push_back(request);
|
| }
|
|
|