Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(24)

Side by Side Diff: ash/desktop_background/desktop_background_resources.h

Issue 10021066: Replace the index mapping of wallpaper picker UI and hard coded wallpaper index in C++ (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Merge to trunk Created 8 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « no previous file | ash/desktop_background/desktop_background_resources.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #ifndef ASH_DESKTOP_BACKGROUND_DESKTOP_BACKGROUND_RESOURCES_H_ 5 #ifndef ASH_DESKTOP_BACKGROUND_DESKTOP_BACKGROUND_RESOURCES_H_
6 #define ASH_DESKTOP_BACKGROUND_DESKTOP_BACKGROUND_RESOURCES_H_ 6 #define ASH_DESKTOP_BACKGROUND_DESKTOP_BACKGROUND_RESOURCES_H_
7 7
8 #include "ash/ash_export.h" 8 #include "ash/ash_export.h"
9 9
10 class SkBitmap; 10 class SkBitmap;
(...skipping 10 matching lines...) Expand all
21 struct ASH_EXPORT WallpaperInfo { 21 struct ASH_EXPORT WallpaperInfo {
22 int id; 22 int id;
23 int thumb_id; 23 int thumb_id;
24 ImageLayout layout; 24 ImageLayout layout;
25 // TODO(bshe): author member should be encoded to UTF16. We need to use i18n 25 // TODO(bshe): author member should be encoded to UTF16. We need to use i18n
26 // string for this member after M19. 26 // string for this member after M19.
27 const char* author; 27 const char* author;
28 const char* website; 28 const char* website;
29 }; 29 };
30 30
31 ASH_EXPORT int GetInvalidWallpaperIndex();
31 ASH_EXPORT int GetDefaultWallpaperIndex(); 32 ASH_EXPORT int GetDefaultWallpaperIndex();
32 ASH_EXPORT int GetGuestWallpaperIndex(); 33 ASH_EXPORT int GetGuestWallpaperIndex();
33 ASH_EXPORT int GetWallpaperCount(); 34 ASH_EXPORT int GetWallpaperCount();
34 ASH_EXPORT const SkBitmap& GetWallpaper(int index); 35 ASH_EXPORT const SkBitmap& GetWallpaper(int index);
35 ASH_EXPORT const SkBitmap& GetWallpaperThumbnail(int index);
36 ASH_EXPORT const WallpaperInfo& GetWallpaperInfo(int index); 36 ASH_EXPORT const WallpaperInfo& GetWallpaperInfo(int index);
37 37
38 } // namespace ash 38 } // namespace ash
39 39
40 #endif // ASH_DESKTOP_BACKGROUND_DESKTOP_BACKGROUND_RESOURCES_H_ 40 #endif // ASH_DESKTOP_BACKGROUND_DESKTOP_BACKGROUND_RESOURCES_H_
OLDNEW
« no previous file with comments | « no previous file | ash/desktop_background/desktop_background_resources.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698