| Index: ash/desktop_background/desktop_background_resources.h
|
| diff --git a/ash/desktop_background/desktop_background_resources.h b/ash/desktop_background/desktop_background_resources.h
|
| index 19f23d079496d15c40ec573917a1919cfda831d1..4b48e9dcb952834cc9754d3d4e1ebacc5135c3e7 100644
|
| --- a/ash/desktop_background/desktop_background_resources.h
|
| +++ b/ash/desktop_background/desktop_background_resources.h
|
| @@ -11,7 +11,7 @@ class SkBitmap;
|
|
|
| namespace ash {
|
|
|
| -enum ImageLayout {
|
| +enum WallpaperLayout {
|
| CENTER,
|
| CENTER_CROPPED,
|
| STRETCH,
|
| @@ -21,7 +21,7 @@ enum ImageLayout {
|
| struct ASH_EXPORT WallpaperInfo {
|
| int id;
|
| int thumb_id;
|
| - ImageLayout layout;
|
| + WallpaperLayout layout;
|
| // TODO(bshe): author member should be encoded to UTF16. We need to use i18n
|
| // string for this member after M19.
|
| const char* author;
|
|
|