Updates to shelf icons for Ash material design

ash/common/system/web_notification/web_notification_tray.cc

 // Copyright (c) 2012 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 "ash/common/system/web_notification/web_notification_tray.h"
 
 #include "ash/common/material_design/material_design_controller.h"
 #include "ash/common/session/session_state_delegate.h"
 #include "ash/common/shelf/shelf_constants.h"
 #include "ash/common/shelf/wm_shelf.h"
 #include "ash/common/shelf/wm_shelf_util.h"
 #include "ash/common/shell_window_ids.h"
 #include "ash/common/system/tray/system_tray.h"
 #include "ash/common/system/tray/system_tray_delegate.h"
 #include "ash/common/system/tray/tray_bubble_wrapper.h"
 #include "ash/common/system/tray/tray_constants.h"
 #include "ash/common/system/tray/tray_utils.h"
 #include "ash/common/system/web_notification/ash_popup_alignment_delegate.h"
 #include "ash/common/wm_lookup.h"
 #include "ash/common/wm_root_window_controller.h"
 #include "ash/common/wm_shell.h"
 #include "ash/common/wm_window.h"
+#include "ash/resources/vector_icons/vector_icons.h"
 #include "base/auto_reset.h"
 #include "base/i18n/number_formatting.h"
 #include "base/i18n/rtl.h"
 #include "base/strings/utf_string_conversions.h"
 #include "base/threading/thread_task_runner_handle.h"
 #include "grit/ash_strings.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/display/display.h"
 #include "ui/display/screen.h"
 #include "ui/gfx/paint_vector_icon.h"
@@ skipping 10 matching lines @@
 #include "ui/views/controls/menu/menu_runner.h"
 #include "ui/views/layout/fill_layout.h"
 
 #if defined(OS_CHROMEOS)
 
 namespace message_center {
 
 MessageCenterTrayDelegate* CreateMessageCenterTray() {
   // On Windows+Ash the Tray will not be hosted in ash::Shell.
   NOTREACHED();
-  return NULL;
+  return nullptr;
 }
 
 }  // namespace message_center
 
 #endif  // defined(OS_CHROMEOS)
 
 namespace ash {
 namespace {
 
 // Menu commands
 constexpr int kToggleQuietMode = 0;
 constexpr int kEnableQuietModeDay = 2;
 
 constexpr int kMaximumSmallIconCount = 3;
 
-constexpr gfx::Size kTrayItemInnerIconSize(16, 16);
-constexpr gfx::Size kTrayItemInnerBellIconSize(18, 18);
 constexpr gfx::Size kTrayItemOuterSize(26, 26);
 constexpr gfx::Insets kTrayItemInsets(3, 3);
 
 constexpr int kTrayItemAnimationDurationMS = 200;
 
 constexpr size_t kMaximumNotificationNumber = 99;
 
 // Flag to disable animation. Only for testing.
 bool disable_animations_for_test = false;
 }
@@ skipping 153 matching lines @@
   std::unique_ptr<gfx::SlideAnimation> animation_;
   bool delete_after_animation_ = false;
   WebNotificationTray* tray_;
 
   DISALLOW_COPY_AND_ASSIGN(WebNotificationItem);
 };
 
 class WebNotificationImage : public WebNotificationItem {
  public:
   WebNotificationImage(const gfx::ImageSkia& image,
-                       gfx::Size size,
                        gfx::AnimationContainer* container,
                        WebNotificationTray* tray)
       : WebNotificationItem(container, tray) {
     view_ = new views::ImageView();
     view_->SetImage(image);
-    view_->SetImageSize(size);
     AddChildView(view_);
   }
 
  private:
   views::ImageView* view_;
 
   DISALLOW_COPY_AND_ASSIGN(WebNotificationImage);
 };
 
 class WebNotificationLabel : public WebNotificationItem {
@@ skipping 37 matching lines @@
     : TrayBackgroundView(shelf),
       status_area_window_(status_area_window),
       system_tray_(system_tray),
       show_message_center_on_unlock_(false),
       should_update_tray_content_(false),
       should_block_shelf_auto_hide_(false) {
   DCHECK(shelf);
   DCHECK(status_area_window_);
   DCHECK(system_tray_);
 
-  gfx::ImageSkia bell_image;
-  if (MaterialDesignController::IsShelfMaterial()) {
-    bell_image = CreateVectorIcon(gfx::VectorIconId::SHELF_NOTIFICATIONS,
-                                  kShelfIconColor);
-  } else {
-    bell_image =
-        CreateVectorIcon(gfx::VectorIconId::NOTIFICATIONS, kNoUnreadIconSize,
-                         kWebNotificationColorNoUnread);
-  }
+  gfx::ImageSkia bell_image =
+      MaterialDesignController::IsShelfMaterial()
+          ? CreateVectorIcon(kShelfNotificationsIcon, kShelfIconColor)
+          : CreateVectorIcon(gfx::VectorIconId::NOTIFICATIONS,
+                             kNoUnreadIconSize, kWebNotificationColorNoUnread);
   bell_icon_.reset(new WebNotificationImage(bell_image,
-                                            kTrayItemInnerBellIconSize,
                                             animation_container_.get(), this));
   tray_container()->AddChildView(bell_icon_.get());
 
   counter_.reset(new WebNotificationLabel(animation_container_.get(), this));
   tray_container()->AddChildView(counter_.get());
 
   SetContentsBackground();
   message_center_tray_.reset(new message_center::MessageCenterTray(
       this, message_center::MessageCenter::Get()));
   popup_alignment_delegate_.reset(new AshPopupAlignmentDelegate(shelf));
@@ skipping 264 matching lines @@
       continue;
 
     if (visible_small_icon_count >= kMaximumSmallIconCount)
       break;
     visible_small_icon_count++;
 
     notification_ids.erase(notification->id());
     if (visible_small_icons_.count(notification->id()) != 0)
       continue;
 
-    auto* item =
-        new WebNotificationImage(image.AsImageSkia(), kTrayItemInnerIconSize,
-                                 animation_container_.get(), this);
+    auto* item = new WebNotificationImage(image.AsImageSkia(),
+                                          animation_container_.get(), this);
     visible_small_icons_.insert(std::make_pair(notification->id(), item));
 
     tray_container()->AddChildViewAt(item, 0);
     item->SetVisible(true);
   }
 
   // Remove unnecessary icons.
   for (const std::string& id : notification_ids) {
     WebNotificationImage* item = visible_small_icons_[id];
     visible_small_icons_.erase(id);
@@ skipping 45 matching lines @@
 
 // Methods for testing
 
 bool WebNotificationTray::IsPopupVisible() const {
   return message_center_tray_->popups_visible();
 }
 
 message_center::MessageCenterBubble*
 WebNotificationTray::GetMessageCenterBubbleForTest() {
   if (!message_center_bubble())
-    return NULL;
+    return nullptr;
   return static_cast<message_center::MessageCenterBubble*>(
       message_center_bubble()->bubble());
 }
 
 }  // namespace ash