Move more vector icons to more appropriate directories.

chrome/browser/download/notification/download_item_notification.h

 // 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.
 
 #ifndef CHROME_BROWSER_DOWNLOAD_NOTIFICATION_DOWNLOAD_ITEM_NOTIFICATION_H_
 #define CHROME_BROWSER_DOWNLOAD_NOTIFICATION_DOWNLOAD_ITEM_NOTIFICATION_H_
 
 #include "base/macros.h"
 #include "base/strings/string_number_conversions.h"
 #include "chrome/browser/download/download_commands.h"
 #include "chrome/browser/download/notification/download_notification.h"
 #include "chrome/browser/image_decoder.h"
 #include "chrome/browser/notifications/notification.h"
 #include "chrome/browser/notifications/notification_delegate.h"
 #include "chrome/browser/notifications/notification_test_util.h"
 #include "content/public/browser/download_item.h"
 #include "third_party/skia/include/core/SkColor.h"
 #include "ui/message_center/message_center.h"
 #include "ui/message_center/message_center_observer.h"
 #include "ui/native_theme/native_theme.h"
 
 class SkBitmap;
 
 namespace test {
 class DownloadItemNotificationTest;
 }
 
 namespace gfx {
-enum class VectorIconId;
+struct VectorIcon;
 }
 
 class DownloadNotificationManagerForProfile;
 
 class DownloadItemNotification : public DownloadNotification,
                                  public ImageDecoder::ImageRequest {
  public:
   DownloadItemNotification(content::DownloadItem* item,
                            DownloadNotificationManagerForProfile* manager);
 
@@ skipping 23 matching lines @@
   };
 
   void CloseNotificationByUser();
   void CloseNotificationByNonUser();
   void Update();
   void UpdateNotificationData(NotificationUpdateType type);
   void UpdateNotificationIcon();
 
   // Set icon of the notification.
   void SetNotificationIcon(int resource_id);
-  void SetNotificationVectorIcon(gfx::VectorIconId id, SkColor color);
+  void SetNotificationVectorIcon(const gfx::VectorIcon& icon, SkColor color);
 
   // Set preview image of the notification. Must be called on IO thread.
   void OnImageLoaded(const std::string& image_data);
   void OnImageCropped(const SkBitmap& image);
 
   // ImageDecoder::ImageRequest overrides:
   void OnImageDecoded(const SkBitmap& decoded_image) override;
   void OnDecodeImageFailed() override;
 
   // Returns a short one-line status string for the download.
@@ skipping 23 matching lines @@
       const;
 
   // Flag to show the notification on next update. If true, the notification
   // goes visible. The initial value is true so it gets shown on initial update.
   bool show_next_ = true;
 
   // Flag if the notification has been closed or not. Setting this flag
   // prevents updates after close.
   bool closed_ = false;
 
-  int image_resource_id_ = 0;
-  std::pair<gfx::VectorIconId, SkColor> vector_icon_params_;
   content::DownloadItem::DownloadState previous_download_state_ =
       content::DownloadItem::MAX_DOWNLOAD_STATE;  // As uninitialized state
   bool previous_dangerous_state_ = false;
   std::unique_ptr<Notification> notification_;
   content::DownloadItem* item_;
   std::unique_ptr<std::vector<DownloadCommands::Command>> button_actions_;
 
   // Status of the preview image decode.
   ImageDecodeStatus image_decode_status_ = NOT_STARTED;
 
   // Pointer to the message center instance.
   message_center::MessageCenter* message_center_;
 
   void SetMessageCenterForTest(
       message_center::MessageCenter* message_center);
 
   base::WeakPtrFactory<DownloadItemNotification> weak_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(DownloadItemNotification);
 };
 
 #endif  // CHROME_BROWSER_DOWNLOAD_NOTIFICATION_DOWNLOAD_ITEM_NOTIFICATION_H_