Changed the Launcher shelf icon in ChromeOS.

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/shelf/shelf_button.h"
 #include "ash/shelf/shelf_button_host.h"
 #include "ash/shelf/shelf_item_types.h"
@@ skipping 122 matching lines @@
     background_image_id = IDR_AURA_NOTIFICATION_BACKGROUND_PRESSED;
   } else {
     if (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(IDR_ASH_SHELF_ICON_APPLIST).ToImageSkia();
+      rb.GetImageNamed(foreground_image_id).ToImageSkia();
 
   gfx::Rect contents_bounds = GetContentsBounds();
   gfx::Rect background_bounds, forground_bounds;
 
   ShelfAlignment alignment = shelf_widget_->GetAlignment();
   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() +
@@ skipping 33 matching lines @@
 
 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