chromeos: Fix pixelated icons in app list and launcher (part 1)

ui/app_list/app_list_item_model.h

 // 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.
 
 #ifndef UI_APP_LIST_APP_LIST_ITEM_MODEL_H_
 #define UI_APP_LIST_APP_LIST_ITEM_MODEL_H_
 #pragma once
 
 #include <string>
 
 #include "base/basictypes.h"
 #include "base/observer_list.h"
-#include "third_party/skia/include/core/SkBitmap.h"
 #include "ui/app_list/app_list_export.h"
+#include "ui/gfx/image/image_skia.h"
 
 namespace ui {
 class MenuModel;
 }
 
 namespace app_list {
 
 class AppListItemModelObserver;
 
 // AppListItemModel provides icon and title to be shown in a AppListItemView
 // and action to be executed when the AppListItemView is activated.
 class APP_LIST_EXPORT AppListItemModel {
  public:
   AppListItemModel();
   virtual ~AppListItemModel();
 
-  void SetIcon(const SkBitmap& icon);
-  const SkBitmap& icon() const {
+  void SetIcon(const gfx::ImageSkia& icon);
+  const gfx::ImageSkia& icon() const {
     return icon_;
   }
 
   void SetTitle(const std::string& title);
   const std::string& title() const {
     return title_;
   }
 
   void SetHighlighted(bool highlighted);
   bool highlighted() const {
     return highlighted_;
   }
 
   void AddObserver(AppListItemModelObserver* observer);
   void RemoveObserver(AppListItemModelObserver* observer);
 
   // Returns the context menu model for this item.
   // Note the menu model is owned by this item.
   virtual ui::MenuModel* GetContextMenuModel();
 
  private:
-  SkBitmap icon_;
+  gfx::ImageSkia icon_;
   std::string title_;
   bool highlighted_;
 
   ObserverList<AppListItemModelObserver> observers_;
 
   DISALLOW_COPY_AND_ASSIGN(AppListItemModel);
 };
 
 }  // namespace app_list
 
 #endif  // UI_APP_LIST_APP_LIST_ITEM_MODEL_H_