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

ui/app_list/app_list_item_model.h

Index: ui/app_list/app_list_item_model.h
diff --git a/ui/app_list/app_list_item_model.h b/ui/app_list/app_list_item_model.h
index c1175508160c4643e40c2bba9adadc8982556ec5..a43572f900cdc5240aa88cb3d5784bd93506ac58 100644
--- a/ui/app_list/app_list_item_model.h
+++ b/ui/app_list/app_list_item_model.h
@@ -9,8 +9,8 @@
 
 #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;
@@ -27,8 +27,8 @@ class APP_LIST_EXPORT AppListItemModel {
   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_;
   }
 
@@ -50,7 +50,7 @@ class APP_LIST_EXPORT AppListItemModel {
   virtual ui::MenuModel* GetContextMenuModel();
 
  private:
-  SkBitmap icon_;
+  gfx::ImageSkia icon_;
   std::string title_;
   bool highlighted_;