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

ash/launcher/launcher_types.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 ASH_LAUNCHER_LAUNCHER_TYPES_H_
 #define ASH_LAUNCHER_LAUNCHER_TYPES_H_
 #pragma once
 
 #include <vector>
 
 #include "ash/ash_export.h"
-#include "third_party/skia/include/core/SkBitmap.h"
+#include "ui/gfx/image/image_skia.h"
 
 namespace aura {
 class Window;
 }
 
 namespace ash {
 
 typedef int LauncherID;
 
 // Height of the Launcher. Hard coded to avoid resizing as items are
@@ skipping 20 matching lines @@
   // Represents a platform app.
   TYPE_PLATFORM_APP,
 };
 
 // Represents the status of pinned or running app launcher items.
 enum LauncherItemStatus {
   // A closed LauncherItem, i.e. has no live instance.
   STATUS_CLOSED,
   // A LauncherItem that has live instance.
   STATUS_RUNNING,
-   // An active LauncherItem that has focus.
+  // An active LauncherItem that has focus.
   STATUS_ACTIVE,
   // A LauncherItem that needs user's attention.
   STATUS_ATTENTION,
   // A LauncherItem that has pending operations.
   //   e.g. A TYEE_APP_SHORTCUT item whose application is
   //        being installed/upgraded.
   // Note STATUS_PENDING is a macro in WinNT.h on Windows.
   STATUS_IS_PENDING,
 };
 
 struct ASH_EXPORT LauncherItem {
   LauncherItem();
   ~LauncherItem();
 
   LauncherItemType type;
 
   // Whether it is drawn as an incognito icon or not. Only used if this is
   // TYPE_TABBED. Note: This cannot be used for identifying incognito windows.
   bool is_incognito;
 
   // Image to display in the launcher. If this item is TYPE_TABBED the image is
   // a favicon image.
-  SkBitmap image;
+  gfx::ImageSkia image;
 
   // Assigned by the model when the item is added.
   LauncherID id;
 
   // Running status.
   LauncherItemStatus status;
 };
 
 typedef std::vector<LauncherItem> LauncherItems;
 
 // The direction of the focus cycling.
 enum CycleDirection {
   CYCLE_FORWARD,
   CYCLE_BACKWARD
 };
 
 }  // namespace ash
 
 #endif  // ASH_LAUNCHER_LAUNCHER_TYPES_H_