| Index: ash/desktop_background/desktop_background_view.h
|
| diff --git a/ash/desktop_background/desktop_background_view.h b/ash/desktop_background/desktop_background_view.h
|
| index 3effb1f382c995f7ebd2597ce188791d87d9ebce..4a5b676942476abe49f124740bcd78f884256c04 100644
|
| --- a/ash/desktop_background/desktop_background_view.h
|
| +++ b/ash/desktop_background/desktop_background_view.h
|
| @@ -16,7 +16,8 @@ namespace internal {
|
|
|
| class DesktopBackgroundView : public views::WidgetDelegateView {
|
| public:
|
| - DesktopBackgroundView(const SkBitmap& wallpaper, ImageLayout layout);
|
| + DesktopBackgroundView(const SkBitmap& wallpaper,
|
| + WallpaperLayout wallpaper_layout);
|
| virtual ~DesktopBackgroundView();
|
|
|
| private:
|
| @@ -26,7 +27,7 @@ class DesktopBackgroundView : public views::WidgetDelegateView {
|
| virtual void OnMouseReleased(const views::MouseEvent& event) OVERRIDE;
|
|
|
| SkBitmap wallpaper_;
|
| - ImageLayout image_layout_;
|
| + WallpaperLayout wallpaper_layout_;
|
|
|
| DISALLOW_COPY_AND_ASSIGN(DesktopBackgroundView);
|
| };
|
|
|