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

Side by Side Diff: chrome/browser/chromeos/login/wallpaper_manager.cc

Issue 10823213: Change default wallpaper. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: fix for 141222 Created 8 years, 4 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/desktop_background/desktop_background_resources.cc ('k') | ui/resources/ui_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 "chrome/browser/chromeos/login/wallpaper_manager.h" 5 #include "chrome/browser/chromeos/login/wallpaper_manager.h"
6 6
7 #include "ash/desktop_background/desktop_background_controller.h" 7 #include "ash/desktop_background/desktop_background_controller.h"
8 #include "ash/shell.h" 8 #include "ash/shell.h"
9 #include "base/command_line.h" 9 #include "base/command_line.h"
10 #include "base/logging.h" 10 #include "base/logging.h"
(...skipping 34 matching lines...) Expand 10 before | Expand all | Expand 10 after
45 const char kWallpaperDateNodeName[] = "date"; 45 const char kWallpaperDateNodeName[] = "date";
46 46
47 const int kThumbnailWidth = 128; 47 const int kThumbnailWidth = 128;
48 const int kThumbnailHeight = 80; 48 const int kThumbnailHeight = 80;
49 49
50 // Default wallpaper index used in OOBE (first boot). 50 // Default wallpaper index used in OOBE (first boot).
51 // Defined here because Chromium default index differs. 51 // Defined here because Chromium default index differs.
52 // Also see ash::WallpaperInfo kDefaultWallpapers in 52 // Also see ash::WallpaperInfo kDefaultWallpapers in
53 // desktop_background_resources.cc 53 // desktop_background_resources.cc
54 #if defined(GOOGLE_CHROME_BUILD) 54 #if defined(GOOGLE_CHROME_BUILD)
55 const int kDefaultOOBEWallpaperIndex = 16; // IDR_AURA_WALLPAPERS_3_URBAN0 55 const int kDefaultOOBEWallpaperIndex = 20; // IDR_AURA_WALLPAPERS_2_LANDSCAPE8
56 #else 56 #else
57 const int kDefaultOOBEWallpaperIndex = 0; // IDR_AURA_WALLPAPERS_ROMAINGUY_0 57 const int kDefaultOOBEWallpaperIndex = 0; // IDR_AURA_WALLPAPERS_ROMAINGUY_0
58 #endif 58 #endif
59 59
60 // Names of nodes with info about wallpaper. 60 // Names of nodes with info about wallpaper.
61 const char kNewWallpaperDateNodeName[] = "date"; 61 const char kNewWallpaperDateNodeName[] = "date";
62 const char kNewWallpaperLayoutNodeName[] = "layout"; 62 const char kNewWallpaperLayoutNodeName[] = "layout";
63 const char kNewWallpaperFileNodeName[] = "file"; 63 const char kNewWallpaperFileNodeName[] = "file";
64 const char kNewWallpaperTypeNodeName[] = "type"; 64 const char kNewWallpaperTypeNodeName[] = "type";
65 65
(...skipping 529 matching lines...) Expand 10 before | Expand all | Expand 10 after
595 595
596 void WallpaperManager::SystemResumed() { 596 void WallpaperManager::SystemResumed() {
597 BatchUpdateWallpaper(); 597 BatchUpdateWallpaper();
598 } 598 }
599 599
600 void WallpaperManager::TimezoneChanged(const icu::TimeZone& timezone) { 600 void WallpaperManager::TimezoneChanged(const icu::TimeZone& timezone) {
601 RestartTimer(); 601 RestartTimer();
602 } 602 }
603 603
604 } // chromeos 604 } // chromeos
OLDNEW
« no previous file with comments | « ash/desktop_background/desktop_background_resources.cc ('k') | ui/resources/ui_resources.grd » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698