| Index: ash/launcher/launcher_types.h
|
| diff --git a/ash/launcher/launcher_types.h b/ash/launcher/launcher_types.h
|
| index d12467fde81b51c7ecacdaf83cd3b02ff834f97e..f6b9e7078e3d729d1a4ff51540b0532282ad3278 100644
|
| --- a/ash/launcher/launcher_types.h
|
| +++ b/ash/launcher/launcher_types.h
|
| @@ -9,7 +9,7 @@
|
| #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;
|
| @@ -50,7 +50,7 @@ enum LauncherItemStatus {
|
| 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,
|
| @@ -73,7 +73,7 @@ struct ASH_EXPORT LauncherItem {
|
|
|
| // 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;
|
|
|