Index: chrome/browser/download/notification/download_item_notification.cc |
diff --git a/chrome/browser/download/notification/download_item_notification.cc b/chrome/browser/download/notification/download_item_notification.cc |
index 732f5bfc827b633e11de3b24e8348c3842217b19..d0b23948508270e57142cde695a21053d7bee2b3 100644 |
--- a/chrome/browser/download/notification/download_item_notification.cc |
+++ b/chrome/browser/download/notification/download_item_notification.cc |
@@ -8,6 +8,7 @@ |
#include <stdint.h> |
#include "base/files/file_util.h" |
+#include "base/metrics/user_metrics.h" |
#include "base/strings/utf_string_conversions.h" |
#include "base/task_scheduler/post_task.h" |
#include "build/build_config.h" |
@@ -31,7 +32,6 @@ |
#include "content/public/browser/download_interrupt_reasons.h" |
#include "content/public/browser/download_item.h" |
#include "content/public/browser/page_navigator.h" |
-#include "content/public/browser/user_metrics.h" |
#include "content/public/browser/web_contents.h" |
#include "net/base/mime_util.h" |
#include "third_party/skia/include/core/SkCanvas.h" |
@@ -121,55 +121,54 @@ SkBitmap CropImage(const SkBitmap& original_bitmap) { |
void RecordButtonClickAction(DownloadCommands::Command command) { |
switch (command) { |
case DownloadCommands::SHOW_IN_FOLDER: |
- content::RecordAction( |
+ base::RecordAction( |
UserMetricsAction("DownloadNotification.Button_ShowInFolder")); |
break; |
case DownloadCommands::OPEN_WHEN_COMPLETE: |
- content::RecordAction( |
+ base::RecordAction( |
UserMetricsAction("DownloadNotification.Button_OpenWhenComplete")); |
break; |
case DownloadCommands::ALWAYS_OPEN_TYPE: |
- content::RecordAction( |
+ base::RecordAction( |
UserMetricsAction("DownloadNotification.Button_AlwaysOpenType")); |
break; |
case DownloadCommands::PLATFORM_OPEN: |
- content::RecordAction( |
+ base::RecordAction( |
UserMetricsAction("DownloadNotification.Button_PlatformOpen")); |
break; |
case DownloadCommands::CANCEL: |
- content::RecordAction( |
+ base::RecordAction( |
UserMetricsAction("DownloadNotification.Button_Cancel")); |
break; |
case DownloadCommands::DISCARD: |
- content::RecordAction( |
+ base::RecordAction( |
UserMetricsAction("DownloadNotification.Button_Discard")); |
break; |
case DownloadCommands::KEEP: |
- content::RecordAction( |
- UserMetricsAction("DownloadNotification.Button_Keep")); |
+ base::RecordAction(UserMetricsAction("DownloadNotification.Button_Keep")); |
break; |
case DownloadCommands::LEARN_MORE_SCANNING: |
- content::RecordAction( |
+ base::RecordAction( |
UserMetricsAction("DownloadNotification.Button_LearnScanning")); |
break; |
case DownloadCommands::LEARN_MORE_INTERRUPTED: |
- content::RecordAction( |
+ base::RecordAction( |
UserMetricsAction("DownloadNotification.Button_LearnInterrupted")); |
break; |
case DownloadCommands::PAUSE: |
- content::RecordAction( |
+ base::RecordAction( |
UserMetricsAction("DownloadNotification.Button_Pause")); |
break; |
case DownloadCommands::RESUME: |
- content::RecordAction( |
+ base::RecordAction( |
UserMetricsAction("DownloadNotification.Button_Resume")); |
break; |
case DownloadCommands::COPY_TO_CLIPBOARD: |
- content::RecordAction( |
+ base::RecordAction( |
UserMetricsAction("DownloadNotification.Button_CopyToClipboard")); |
break; |
case DownloadCommands::ANNOTATE: |
- content::RecordAction( |
+ base::RecordAction( |
UserMetricsAction("DownloadNotification.Button_Annotate")); |
break; |
} |
@@ -220,7 +219,7 @@ bool DownloadItemNotification::HasNotificationClickedListener() { |
void DownloadItemNotification::OnNotificationClose() { |
if (item_ && item_->IsDangerous() && !item_->IsDone()) { |
- content::RecordAction( |
+ base::RecordAction( |
UserMetricsAction("DownloadNotification.Close_Dangerous")); |
closed_ = true; // Should be set before cancelling the download. |
item_->Cancel(true /* by_user */); |
@@ -235,7 +234,7 @@ void DownloadItemNotification::OnNotificationClose() { |
void DownloadItemNotification::OnNotificationClick() { |
if (item_->IsDangerous()) { |
- content::RecordAction( |
+ base::RecordAction( |
UserMetricsAction("DownloadNotification.Click_Dangerous")); |
// Do nothing. |
return; |
@@ -243,13 +242,13 @@ void DownloadItemNotification::OnNotificationClick() { |
switch (item_->GetState()) { |
case content::DownloadItem::IN_PROGRESS: |
- content::RecordAction( |
+ base::RecordAction( |
UserMetricsAction("DownloadNotification.Click_InProgress")); |
item_->SetOpenWhenComplete(!item_->GetOpenWhenComplete()); // Toggle |
break; |
case content::DownloadItem::CANCELLED: |
case content::DownloadItem::INTERRUPTED: |
- content::RecordAction( |
+ base::RecordAction( |
UserMetricsAction("DownloadNotification.Click_Stopped")); |
GetBrowser()->OpenURL(content::OpenURLParams( |
GURL(chrome::kChromeUIDownloadsURL), content::Referrer(), |
@@ -258,7 +257,7 @@ void DownloadItemNotification::OnNotificationClick() { |
CloseNotificationByUser(); |
break; |
case content::DownloadItem::COMPLETE: |
- content::RecordAction( |
+ base::RecordAction( |
UserMetricsAction("DownloadNotification.Click_Completed")); |
item_->OpenDownload(); |
CloseNotificationByUser(); |