Use vector icon for Ash shelf launcher

ash/shelf/app_list_button.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/shelf/app_list_button.h"
 
 #include "ash/ash_constants.h"
+#include "ash/material_design/material_design_controller.h"
 #include "ash/shelf/shelf_item_types.h"
 #include "ash/shelf/shelf_layout_manager.h"
 #include "ash/shelf/shelf_view.h"
 #include "ash/shelf/shelf_widget.h"
 #include "ash/shell.h"
 #include "base/command_line.h"
 #include "grit/ash_resources.h"
 #include "grit/ash_strings.h"
 #include "ui/accessibility/ax_view_state.h"
 #include "ui/app_list/app_list_switches.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/base/ui_base_switches_util.h"
 #include "ui/gfx/canvas.h"
+#include "ui/gfx/paint_vector_icon.h"
+#include "ui/gfx/vector_icons_public.h"
 #include "ui/views/painter.h"
 
 namespace ash {
 
 AppListButton::AppListButton(ShelfView* shelf_view)
     : views::ImageButton(shelf_view),
       draw_background_as_active_(false),
       shelf_view_(shelf_view) {
   SetAccessibleName(
       app_list::switches::IsExperimentalAppListEnabled()
@@ skipping 70 matching lines @@
   int background_image_id = 0;
   if (Shell::GetInstance()->GetAppListTargetVisibility() ||
       draw_background_as_active_) {
     background_image_id = IDR_AURA_NOTIFICATION_BACKGROUND_PRESSED;
   } else {
     if (shelf_view_->shelf()->shelf_widget()->GetDimsShelf())
       background_image_id = IDR_AURA_NOTIFICATION_BACKGROUND_ON_BLACK;
     else
       background_image_id = IDR_AURA_NOTIFICATION_BACKGROUND_NORMAL;
   }
+
   ResourceBundle& rb = ResourceBundle::GetSharedInstance();
   const gfx::ImageSkia* background_image =
       rb.GetImageNamed(background_image_id).ToImageSkia();
-  // TODO(mgiuca): When the "classic" app list is removed, also remove this
-  // resource and its icon file.
-  int foreground_image_id = app_list::switches::IsExperimentalAppListEnabled()
-                                ? IDR_ASH_SHELF_ICON_APPLIST
-                                : IDR_ASH_SHELF_ICON_APPLIST_CLASSIC;
-  const gfx::ImageSkia* forground_image =
-      rb.GetImageNamed(foreground_image_id).ToImageSkia();
+  const gfx::ImageSkia& forground_image =

[James Cook, 2016/06/07 15:51:52]

nit: for_e_ground

Can you also fix forground_bounds while you're here?

[tdanderson, 2016/06/08 17:29:27]

Done.

+      MaterialDesignController::IsShelfMaterial()
+          ? CreateVectorIcon(gfx::VectorIconId::SHELF_LAUNCHER, kShelfIconColor)

[James Cook, 2016/06/07 15:51:52]

Given that the class is called AppList, and the legacy icons are called APPLIST,
and there's a bunch of code in ui/app_list, do you really want the new icon id
to be LAUNCHER?

[tdanderson, 2016/06/08 17:29:27]

No, I guess I don't. Changed.

+          : *rb.GetImageNamed(IDR_ASH_SHELF_ICON_APPLIST).ToImageSkia();
 
   gfx::Rect contents_bounds = GetContentsBounds();
   gfx::Rect background_bounds, forground_bounds;
 
   ShelfAlignment alignment = shelf_view_->shelf()->alignment();
   background_bounds.set_size(background_image->size());
   if (alignment == SHELF_ALIGNMENT_LEFT) {
     background_bounds.set_x(contents_bounds.width() -
         ShelfLayoutManager::kShelfItemInset - background_image->width());
     background_bounds.set_y(contents_bounds.y() +
         (contents_bounds.height() - background_image->height()) / 2);
   } else if (alignment == SHELF_ALIGNMENT_RIGHT) {
     background_bounds.set_x(ShelfLayoutManager::kShelfItemInset);
     background_bounds.set_y(contents_bounds.y() +
         (contents_bounds.height() - background_image->height()) / 2);
   } else {
     background_bounds.set_y(ShelfLayoutManager::kShelfItemInset);
     background_bounds.set_x(contents_bounds.x() +
         (contents_bounds.width() - background_image->width()) / 2);
   }
 
-  forground_bounds.set_size(forground_image->size());
+  forground_bounds.set_size(forground_image.size());
+
   forground_bounds.set_x(background_bounds.x() +
       std::max(0,
           (background_bounds.width() - forground_bounds.width()) / 2));
   forground_bounds.set_y(background_bounds.y() +
       std::max(0,
           (background_bounds.height() - forground_bounds.height()) / 2));
 
   canvas->DrawImageInt(*background_image,
                        background_bounds.x(),
                        background_bounds.y());
-  canvas->DrawImageInt(*forground_image,
+  canvas->DrawImageInt(forground_image,
                        forground_bounds.x(),
                        forground_bounds.y());
 
   views::Painter::PaintFocusPainter(this, canvas, focus_painter());
 }
 
 void AppListButton::GetAccessibleState(ui::AXViewState* state) {
   state->role = ui::AX_ROLE_BUTTON;
   state->name = shelf_view_->GetTitleForView(this);
 }
 
 void AppListButton::SetDrawBackgroundAsActive(
     bool draw_background_as_active) {
   if (draw_background_as_active_ == draw_background_as_active)
     return;
   draw_background_as_active_ = draw_background_as_active;
   SchedulePaint();
 }
 
 }  // namespace ash