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

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

Issue 10910264: Move wallpapers to ash/resource (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: mac fix Created 8 years, 3 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 | « ash/ash_resources.gypi ('k') | ash/resources/ash_wallpaper_resources.grd » ('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 #include "ash/desktop_background/desktop_background_resources.h" 5 #include "ash/desktop_background/desktop_background_resources.h"
6 6
7 #include "base/logging.h" 7 #include "base/logging.h"
8 #include "base/rand_util.h" 8 #include "base/rand_util.h"
9 #include "grit/ui_resources_wallpapers.h" 9 #include "grit/ash_wallpaper_resources.h"
10 #include "ui/base/resource/resource_bundle.h" 10 #include "ui/base/resource/resource_bundle.h"
11 #include "ui/gfx/image/image.h" 11 #include "ui/gfx/image/image.h"
12 12
13 namespace { 13 namespace {
14 14
15 // Keeps in sync (same order) with WallpaperLayout enum in header file. 15 // Keeps in sync (same order) with WallpaperLayout enum in header file.
16 const char* kWallpaperLayoutArrays[] = { 16 const char* kWallpaperLayoutArrays[] = {
17 "CENTER", 17 "CENTER",
18 "CENTER_CROPPED", 18 "CENTER_CROPPED",
19 "STRETCH", 19 "STRETCH",
(...skipping 450 matching lines...) Expand 10 before | Expand all | Expand 10 after
470 470
471 const WallpaperViewInfo& GetWallpaperViewInfo(int index, 471 const WallpaperViewInfo& GetWallpaperViewInfo(int index,
472 WallpaperResolution resolution) { 472 WallpaperResolution resolution) {
473 if (resolution == SMALL) 473 if (resolution == SMALL)
474 return kDefaultWallpapers[index].small_wallpaper; 474 return kDefaultWallpapers[index].small_wallpaper;
475 else 475 else
476 return kDefaultWallpapers[index].large_wallpaper; 476 return kDefaultWallpapers[index].large_wallpaper;
477 } 477 }
478 478
479 } // namespace ash 479 } // namespace ash
OLDNEW
« no previous file with comments | « ash/ash_resources.gypi ('k') | ash/resources/ash_wallpaper_resources.grd » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698