Vectorize the remaining material design shelf icons

ash/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/system/web_notification/web_notification_tray.h"
 
 #include "ash/ash_switches.h"
+#include "ash/common/material_design/material_design_controller.h"
+#include "ash/common/shelf/shelf_constants.h"
 #include "ash/common/shelf/wm_shelf_util.h"
 #include "ash/common/shell_window_ids.h"
 #include "ash/common/wm_lookup.h"
 #include "ash/common/wm_root_window_controller.h"
 #include "ash/common/wm_window.h"
 #include "ash/root_window_controller.h"
 #include "ash/shelf/shelf_layout_manager.h"
 #include "ash/shelf/shelf_layout_manager_observer.h"
 #include "ash/shelf/shelf_util.h"
 #include "ash/shelf/shelf_widget.h"
@@ skipping 98 matching lines @@
 };
 
 class WebNotificationButton : public views::CustomButton {
  public:
   WebNotificationButton(views::ButtonListener* listener)
       : views::CustomButton(listener),
         is_bubble_visible_(false),
         unread_count_(0) {
     SetLayoutManager(new views::FillLayout);
 
-    no_unread_icon_.SetImage(gfx::CreateVectorIcon(
-        gfx::VectorIconId::NOTIFICATIONS, kNoUnreadIconSize,
-        kWebNotificationColorNoUnread));
+    gfx::ImageSkia image_md = CreateVectorIcon(

[James Cook, 2016/06/09 19:24:48]

ditto

[tdanderson, 2016/06/09 22:36:33]

Done.

+        gfx::VectorIconId::SHELF_NOTIFICATIONS, kShelfIconColor);
+    gfx::ImageSkia image_non_md =
+        CreateVectorIcon(gfx::VectorIconId::NOTIFICATIONS, kNoUnreadIconSize,
+                         kWebNotificationColorNoUnread);
+    no_unread_icon_.SetImage(
+        MaterialDesignController::IsMaterial() ? image_md : image_non_md);
     no_unread_icon_.set_owned_by_client();
 
     unread_label_.set_owned_by_client();
     SetupLabelForTray(&unread_label_);
 
     AddChildView(&unread_label_);
   }
 
   void SetBubbleVisible(bool visible) {
     if (visible == is_bubble_visible_)
@@ skipping 375 matching lines @@
 
 message_center::MessageCenterBubble*
 WebNotificationTray::GetMessageCenterBubbleForTest() {
   if (!message_center_bubble())
     return NULL;
   return static_cast<message_center::MessageCenterBubble*>(
       message_center_bubble()->bubble());
 }
 
 }  // namespace ash