Vectorize the remaining material design shelf icons

ash/system/overview/overview_button_tray.cc

 // Copyright 2014 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/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/common/system/tray/system_tray_delegate.h"
 #include "ash/common/wm_shell.h"
 #include "ash/shelf/shelf_util.h"
 #include "ash/shell.h"
 #include "ash/system/tray/tray_utils.h"
 #include "ash/wm/maximize_mode/maximize_mode_controller.h"
 #include "ash/wm/overview/window_selector_controller.h"
 #include "grit/ash_resources.h"
 #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"
 
 namespace {
 
 // Predefined padding for the icon used in this tray. These are to be set to the
 // border of the icon, depending on the current shelf_alignment()
 const int kHorizontalShelfHorizontalPadding = 8;
 const int kHorizontalShelfVerticalPadding = 4;
 const int kVerticalShelfHorizontalPadding = 2;
 const int kVerticalShelfVerticalPadding = 5;
 
 }  // namespace
 
 namespace ash {
 
 OverviewButtonTray::OverviewButtonTray(StatusAreaWidget* status_area_widget)
     : TrayBackgroundView(status_area_widget), icon_(NULL) {
   SetContentsBackground();
 
-  ui::ResourceBundle& bundle = ui::ResourceBundle::GetSharedInstance();
   icon_ = new views::ImageView();
-  icon_->SetImage(
-      bundle.GetImageNamed(IDR_AURA_UBER_TRAY_OVERVIEW_MODE).ToImageSkia());
+  if (MaterialDesignController::IsShelfMaterial()) {
+    gfx::ImageSkia image_md =
+        CreateVectorIcon(gfx::VectorIconId::SHELF_OVERVIEW, kShelfIconColor);
+    icon_->SetImage(&image_md);

[James Cook, 2016/06/09 23:00:09]

Can you just call icon_->SetImage(image_id) to make it obvious that the SetImage
call won't do something bad with a pointer to a local variable?

(I think SetImage(const ImageSkia*) does the right thing here, but there's a
version that takes a const ImageSkia& that would be more clear.)

[tdanderson, 2016/06/09 23:51:41]

Done.

+  } else {
+    gfx::ImageSkia* image_non_md =
+        ui::ResourceBundle::GetSharedInstance().GetImageSkiaNamed(
+            IDR_AURA_UBER_TRAY_OVERVIEW_MODE);
+    icon_->SetImage(image_non_md);
+  }
   SetIconBorderForShelfAlignment();
   tray_container()->AddChildView(icon_);
 
   WmShell::Get()->AddShellObserver(this);
   Shell::GetInstance()->session_state_delegate()->AddSessionStateObserver(this);
 }
 
 OverviewButtonTray::~OverviewButtonTray() {
   WmShell::Get()->RemoveShellObserver(this);
   Shell::GetInstance()->session_state_delegate()->RemoveSessionStateObserver(
@@ skipping 78 matching lines @@
       shell->maximize_mode_controller()->IsMaximizeModeWindowManagerEnabled() &&
       session_state_delegate->IsActiveUserSessionStarted() &&
       !session_state_delegate->IsScreenLocked() &&
       session_state_delegate->GetSessionState() ==
           SessionStateDelegate::SESSION_STATE_ACTIVE &&
       shell->system_tray_delegate()->GetUserLoginStatus() !=
           LoginStatus::KIOSK_APP);
 }
 
 }  // namespace ash