Move more vector icons to more appropriate directories.

chrome/browser/download/notification/download_item_notification.cc

 // Copyright 2015 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/download/notification/download_item_notification.h"
 
 #include <stddef.h>
 #include <stdint.h>
 
 #include "base/files/file_util.h"
 #include "base/strings/utf_string_conversions.h"
 #include "base/task_scheduler/post_task.h"
 #include "build/build_config.h"
+#include "chrome/app/vector_icons/vector_icons.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/download/download_crx_util.h"
 #include "chrome/browser/download/download_item_model.h"
 #include "chrome/browser/download/notification/download_notification_manager.h"
 #include "chrome/browser/notifications/notification.h"
 #include "chrome/browser/notifications/notification_ui_manager.h"
 #include "chrome/browser/notifications/profile_notification.h"
 #include "chrome/browser/ui/scoped_tabbed_browser_displayer.h"
 #include "chrome/common/url_constants.h"
 #include "chrome/grit/chromium_strings.h"
@@ skipping 11 matching lines @@
 #include "net/base/mime_util.h"
 #include "third_party/skia/include/core/SkCanvas.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/l10n/time_format.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/base/text/bytes_formatting.h"
 #include "ui/gfx/codec/jpeg_codec.h"
 #include "ui/gfx/color_palette.h"
 #include "ui/gfx/image/image.h"
 #include "ui/gfx/paint_vector_icon.h"
-#include "ui/gfx/vector_icons_public.h"
 #include "ui/message_center/message_center.h"
 #include "ui/message_center/message_center_style.h"
+#include "ui/vector_icons/vector_icons.h"
 
 #if defined(OS_CHROMEOS)
 #include "chrome/browser/chromeos/note_taking_helper.h"
 #endif  // defined(OS_CHROMEOS)
 
 using base::UserMetricsAction;
 
 namespace {
 
 const char kDownloadNotificationNotifierId[] =
@@ skipping 117 matching lines @@
 }
 
 }  // anonymous namespace
 
 DownloadItemNotification::DownloadItemNotification(
     content::DownloadItem* item,
     DownloadNotificationManagerForProfile* manager)
     : item_(item),
       message_center_(manager->message_center()),
       weak_factory_(this) {
-
   // Creates the notification instance. |title|, |body| and |icon| will be
   // overridden by UpdateNotificationData() below.
   notification_.reset(new Notification(
       message_center::NOTIFICATION_TYPE_PROGRESS,
       base::string16(),  // title
       base::string16(),  // body
       gfx::Image(),      // icon
       message_center::NotifierId(message_center::NotifierId::SYSTEM_COMPONENT,
                                  kDownloadNotificationNotifierId),
       base::string16(),                    // display_source
@@ skipping 295 matching lines @@
 }
 
 void DownloadItemNotification::UpdateNotificationIcon() {
   if (item_->IsDangerous()) {
     DownloadItemModel model(item_);
 #if defined(OS_MACOSX)
     SetNotificationIcon(model.MightBeMalicious()
                             ? IDR_DOWNLOAD_NOTIFICATION_WARNING_BAD
                             : IDR_DOWNLOAD_NOTIFICATION_WARNING_UNWANTED);
 #else
-    SetNotificationVectorIcon(
-        gfx::VectorIconId::WARNING,
-        model.MightBeMalicious() ? gfx::kGoogleRed700 : gfx::kGoogleYellow700);
+    SetNotificationVectorIcon(ui::kWarningIcon, model.MightBeMalicious()
+                                                    ? gfx::kGoogleRed700
+                                                    : gfx::kGoogleYellow700);
 #endif
     return;
   }
 
   bool is_off_the_record = item_->GetBrowserContext() &&
                            item_->GetBrowserContext()->IsOffTheRecord();
   switch (item_->GetState()) {
     case content::DownloadItem::IN_PROGRESS:
     case content::DownloadItem::COMPLETE:
       if (is_off_the_record) {
 #if defined(OS_MACOSX)
         SetNotificationIcon(IDR_DOWNLOAD_NOTIFICATION_INCOGNITO);
 #else
-        SetNotificationVectorIcon(gfx::VectorIconId::FILE_DOWNLOAD_INCOGNITO,
+        SetNotificationVectorIcon(kFileDownloadIncognitoIcon,
                                   gfx::kChromeIconGrey);
 #endif
       } else {
-        SetNotificationVectorIcon(gfx::VectorIconId::FILE_DOWNLOAD,
-                                  gfx::kGoogleBlue500);
+        SetNotificationVectorIcon(kFileDownloadIcon, gfx::kGoogleBlue500);
       }
       break;
 
     case content::DownloadItem::INTERRUPTED:
 #if defined(OS_MACOSX)
       SetNotificationIcon(IDR_DOWNLOAD_NOTIFICATION_ERROR);
 #else
-      SetNotificationVectorIcon(gfx::VectorIconId::ERROR_CIRCLE,
-                                gfx::kGoogleRed700);
+      SetNotificationVectorIcon(ui::kErrorCircleIcon, gfx::kGoogleRed700);
 #endif
       break;
 
     case content::DownloadItem::CANCELLED:
       break;
 
     case content::DownloadItem::MAX_DOWNLOAD_STATE:
       NOTREACHED();
       break;
   }
 }
 
 void DownloadItemNotification::OnDownloadRemoved(content::DownloadItem* item) {
   // The given |item| may be already free'd.
   DCHECK_EQ(item, item_);
 
   // Removing the notification causes calling |NotificationDelegate::Close()|.
   if (g_browser_process->notification_ui_manager()) {
     g_browser_process->notification_ui_manager()->CancelById(
         watcher()->id(), NotificationUIManager::GetProfileID(profile()));
   }
 
   item_ = nullptr;
 }
 
 void DownloadItemNotification::SetNotificationIcon(int resource_id) {
-  if (image_resource_id_ == resource_id)
-    return;
   ui::ResourceBundle& bundle = ui::ResourceBundle::GetSharedInstance();
-  image_resource_id_ = resource_id;
-  notification_->set_icon(bundle.GetImageNamed(image_resource_id_));
+  notification_->set_icon(bundle.GetImageNamed(resource_id));
 }
 
-void DownloadItemNotification::SetNotificationVectorIcon(gfx::VectorIconId id,
-                                                         SkColor color) {
-  if (vector_icon_params_ == std::make_pair(id, color))
-    return;
-  vector_icon_params_ = std::make_pair(id, color);
-  image_resource_id_ = 0;
-  notification_->set_icon(gfx::Image(gfx::CreateVectorIcon(id, 40, color)));
+void DownloadItemNotification::SetNotificationVectorIcon(
+    const gfx::VectorIcon& icon,
+    SkColor color) {
+  notification_->set_icon(gfx::Image(gfx::CreateVectorIcon(icon, 40, color)));
 }
 
 void DownloadItemNotification::DisablePopup() {
   if (notification_->priority() == message_center::LOW_PRIORITY)
     return;
   // Hides a notification from popup notifications if it's a pop-up, by
   // decreasing its priority and reshowing itself. Low-priority notifications
   // doesn't pop-up itself so this logic works as disabling pop-up.
   CloseNotificationByNonUser();
   notification_->set_priority(message_center::LOW_PRIORITY);
@@ skipping 355 matching lines @@
   const std::string notification_id_in_message_center = notification->id();
 
   message_center::NotificationList::Notifications visible_notifications =
       message_center_->GetVisibleNotifications();
   for (auto* notification : visible_notifications) {
     if (notification->id() == notification_id_in_message_center)
       return true;
   }
   return false;
 }