Re-add size parameter to WebNotificationImage for notification center

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"
@@ skipping 49 matching lines @@
 
 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 kTrayItemInnerBellIconSizeNonMd(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,
+                       const 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_);
 
+  const bool md_shelf = MaterialDesignController::IsShelfMaterial();
   gfx::ImageSkia bell_image =
-      MaterialDesignController::IsShelfMaterial()
+      md_shelf
           ? CreateVectorIcon(kShelfNotificationsIcon, kShelfIconColor)
           : CreateVectorIcon(gfx::VectorIconId::NOTIFICATIONS,
                              kNoUnreadIconSize, kWebNotificationColorNoUnread);
-  bell_icon_.reset(new WebNotificationImage(bell_image,
+  const gfx::Size bell_icon_size =
+      md_shelf ? kTrayItemInnerIconSize : kTrayItemInnerBellIconSizeNonMd;
+  bell_icon_.reset(new WebNotificationImage(bell_image, bell_icon_size,
                                             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(),
-                                          animation_container_.get(), this);
+    auto* item =
+        new WebNotificationImage(image.AsImageSkia(), kTrayItemInnerIconSize,
+                                 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 51 matching lines @@
 
 message_center::MessageCenterBubble*
 WebNotificationTray::GetMessageCenterBubbleForTest() {
   if (!message_center_bubble())
     return nullptr;
   return static_cast<message_center::MessageCenterBubble*>(
       message_center_bubble()->bubble());
 }
 
 }  // namespace ash