ash: Avoid implicit conversion from ImageSkia into SkBitmap.

ash/desktop_background/desktop_background_controller.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_DESKTOP_BACKGROUND_DESKTOP_BACKGROUND_CONTROLLER_H_
 #define ASH_DESKTOP_BACKGROUND_DESKTOP_BACKGROUND_CONTROLLER_H_
 
 #include "ash/ash_export.h"
 #include "ash/desktop_background/desktop_background_resources.h"
 #include "ash/wm/window_animations.h"
 #include "base/basictypes.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/memory/weak_ptr.h"
-#include "third_party/skia/include/core/SkBitmap.h"
-#include "third_party/skia/include/core/SkColor.h"
 #include "ui/aura/window.h"
 #include "ui/aura/window_observer.h"
 #include "ui/compositor/layer.h"
 #include "ui/gfx/image/image_skia.h"
 
+typedef unsigned int SkColor;
+
 namespace aura {
 class RootWindow;
 }
 
 namespace ash {
 
 class UserWallpaperDelegate {
  public:
   virtual ~UserWallpaperDelegate() {}
 
@@ skipping 31 matching lines @@
 
   // Gets the desktop background mode.
   BackgroundMode desktop_background_mode() const {
     return desktop_background_mode_;
   }
 
   gfx::ImageSkia GetWallpaper() const;
 
   WallpaperLayout GetWallpaperLayout() const;
 
-  // Provides current image on the background, or empty SkBitmap if there is
-  // no image, e.g. background is solid color.
-  SkBitmap GetCurrentWallpaperImage();
+  // Provides current image on the background, or empty gfx::ImageSkia if there
+  // is no image, e.g. background is solid color.
+  gfx::ImageSkia GetCurrentWallpaperImage();
 
   // Initialize root window's background.
   void OnRootWindowAdded(aura::RootWindow* root_window);
 
   // Loads default wallpaper at |index| asynchronously but does not set the
   // loaded image to current wallpaper. Resource bundle will cache the loaded
   // image.
   void CacheDefaultWallpaper(int index);
 
   // Loads default wallpaper at |index| asynchronously and sets to current
@@ skipping 81 matching lines @@
   scoped_refptr<WallpaperOperation> wallpaper_op_;
 
   base::WeakPtrFactory<DesktopBackgroundController> weak_ptr_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(DesktopBackgroundController);
 };
 
 }  // namespace ash
 
 #endif  // ASH_DESKTOP_BACKGROUND_DESKTOP_BACKGROUND_CONTROLLER_H_