Vectorize the remaining material design shelf icons

ash/system/overview/overview_button_tray.cc

Index: ash/system/overview/overview_button_tray.cc
diff --git a/ash/system/overview/overview_button_tray.cc b/ash/system/overview/overview_button_tray.cc
index 4a90405e35b2902308cc2e1d75282738be550985..aaa9e3590fc6cc94589f64c794c447b6bfff418a 100644
--- a/ash/system/overview/overview_button_tray.cc
+++ b/ash/system/overview/overview_button_tray.cc
@@ -4,7 +4,9 @@
 
 #include "ash/system/overview/overview_button_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/shelf_types.h"
 #include "ash/common/shelf/wm_shelf_util.h"
 #include "ash/shelf/shelf_util.h"
@@ -17,6 +19,8 @@
 #include "grit/ash_strings.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/resource/resource_bundle.h"
+#include "ui/gfx/paint_vector_icon.h"
+#include "ui/gfx/vector_icons_public.h"
 #include "ui/views/border.h"
 #include "ui/views/controls/image_view.h"
 
@@ -39,8 +43,12 @@ OverviewButtonTray::OverviewButtonTray(StatusAreaWidget* status_area_widget)
 
   ui::ResourceBundle& bundle = ui::ResourceBundle::GetSharedInstance();
   icon_ = new views::ImageView();
-  icon_->SetImage(
-      bundle.GetImageNamed(IDR_AURA_UBER_TRAY_OVERVIEW_MODE).ToImageSkia());
+  gfx::ImageSkia image_md =

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

ditto

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

Done.

+      CreateVectorIcon(gfx::VectorIconId::SHELF_OVERVIEW, kShelfIconColor);
+  gfx::ImageSkia* image_non_md =
+      bundle.GetImageSkiaNamed(IDR_AURA_UBER_TRAY_OVERVIEW_MODE);
+  icon_->SetImage(MaterialDesignController::IsMaterial() ? &image_md
+                                                         : image_non_md);
   SetIconBorderForShelfAlignment();
   tray_container()->AddChildView(icon_);