ash/desktop_background/desktop_background_resources.h - Issue 9580023: Enable user change background image in settings page in Aura build.

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

Issue 9580023: Enable user change background image in settings page in Aura build. (Closed) Base URL: http://git.chromium.org/git/chromium.git@trunk

Patch Set: Move kPresetWallpaperIndex to desktop_background_resource Created 8 years, 9 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

« ash/desktop_background/desktop_background_controller.cc ('K') | « ash/desktop_background/desktop_background_controller.cc ('k') | ash/desktop_background/desktop_background_resources.cc » ('j') | ash/desktop_background/desktop_background_view.h » ('J')
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

OLD	NEW
(Empty)
	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

	3 // found in the LICENSE file.

	4

	5 #ifndef ASH_DESKTOP_BACKGROUND_DESKTOP_BACKGROUND_RESOURCES_H_

	6 #define ASH_DESKTOP_BACKGROUND_DESKTOP_BACKGROUND_RESOURCES_H_

	7

	8 class SkBitmap;

	9

	10 namespace ash {

	11

	12 // This probably needs to put to another place. But I am not sure where is the

	13 // best place. It's basically util function which used both by ash and by

	14 // webui handler.
	flackr 2012/03/07 20:50:28 Remove comment or change to TODO. Given that you h Remove comment or change to TODO. Given that you have accessors for the WallPaper, WallpaperThumbnail, you could probably add one for WallpaperCount and remove these from being global variables. bshe 2012/03/07 23:48:35 Put them behind internal namespace. Not sure if th Show quoted text On 2012/03/07 20:50:28, flackr wrote: > Remove comment or change to TODO. Given that you have accessors for the > WallPaper, WallpaperThumbnail, you could probably add one for WallpaperCount and > remove these from being global variables. Put them behind internal namespace. Not sure if that's what you mean though... flackr 2012/03/08 01:19:58 Nope. What I meant was that the functions give you Show quoted text On 2012/03/07 23:48:35, bshe wrote: > On 2012/03/07 20:50:28, flackr wrote: > > Remove comment or change to TODO. Given that you have accessors for the > > WallPaper, WallpaperThumbnail, you could probably add one for WallpaperCount > and > > remove these from being global variables. > > Put them behind internal namespace. Not sure if that's what you mean though... Nope. What I meant was that the functions give you all of these constants so they can be removed from the header file and only defined in the .cc file in an anonymous namespace (see comment in .cc file). bshe 2012/03/08 03:19:24 Done. Show quoted text On 2012/03/08 01:19:58, flackr wrote: > On 2012/03/07 23:48:35, bshe wrote: > > On 2012/03/07 20:50:28, flackr wrote: > > > Remove comment or change to TODO. Given that you have accessors for the > > > WallPaper, WallpaperThumbnail, you could probably add one for WallpaperCount > > and > > > remove these from being global variables. > > > > Put them behind internal namespace. Not sure if that's what you mean though... > > Nope. What I meant was that the functions give you all of these constants so > they can be removed from the header file and only defined in the .cc file in an > anonymous namespace (see comment in .cc file). Done.
	15 extern const int kDefaultWallpaperResources[];

	16 extern const int kDefaultWallpaperResourcesThumb[];

	17 extern const int kDefaultWallpaperCount;

	18 extern const int kPresetWallpaperIndex;

	19

	20 const SkBitmap& GetDefaultWallpaper(int index);

	21 const SkBitmap& GetDefaultWallpaperThumbnail(int index);

	22

	23 } // namespace ash

	24

	25 #endif // ASH_DESKTOP_BACKGROUND_DESKTOP_BACKGROUND_RESOURCES_H_

OLD	NEW