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

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

Issue 10827203: Deselect should maintain previously selected wallpaper and guest should load default guest wallpaper (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: nit 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 | « no previous file | chrome/browser/chromeos/login/wallpaper_manager.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 CHROME_BROWSER_CHROMEOS_LOGIN_WALLPAPER_MANAGER_H_ 5 #ifndef CHROME_BROWSER_CHROMEOS_LOGIN_WALLPAPER_MANAGER_H_
6 #define CHROME_BROWSER_CHROMEOS_LOGIN_WALLPAPER_MANAGER_H_ 6 #define CHROME_BROWSER_CHROMEOS_LOGIN_WALLPAPER_MANAGER_H_
7 7
8 #include <string> 8 #include <string>
9 9
10 #include "ash/desktop_background/desktop_background_resources.h" 10 #include "ash/desktop_background/desktop_background_resources.h"
(...skipping 101 matching lines...) Expand 10 before | Expand all | Expand 10 after
112 void SetLastSelectedUser(const std::string& last_selected_user); 112 void SetLastSelectedUser(const std::string& last_selected_user);
113 113
114 // Sets |email|'s wallpaper. 114 // Sets |email|'s wallpaper.
115 void SetUserWallpaper(const std::string& email); 115 void SetUserWallpaper(const std::string& email);
116 116
117 // Sets wallpaper to |wallpaper|. 117 // Sets wallpaper to |wallpaper|.
118 void SetWallpaperFromImageSkia(const gfx::ImageSkia& wallpaper, 118 void SetWallpaperFromImageSkia(const gfx::ImageSkia& wallpaper,
119 ash::WallpaperLayout layout); 119 ash::WallpaperLayout layout);
120 120
121 // User was deselected at login screen, reset wallpaper if needed. 121 // User was deselected at login screen, reset wallpaper if needed.
122 void OnUserDeselected(); 122 void OnUserDeselected() {}
123 123
124 // User |email| was selected at login screen, load wallpaper. 124 // User |email| was selected at login screen, load wallpaper.
125 void OnUserSelected(const std::string& email); 125 void OnUserSelected(const std::string& email);
126 126
127 private: 127 private:
128 typedef std::map<std::string, gfx::ImageSkia> CustomWallpaperMap; 128 typedef std::map<std::string, gfx::ImageSkia> CustomWallpaperMap;
129 129
130 virtual ~WallpaperManager(); 130 virtual ~WallpaperManager();
131 131
132 // Change the wallpapers for users who choose DAILY wallpaper type. Updates 132 // Change the wallpapers for users who choose DAILY wallpaper type. Updates
(...skipping 72 matching lines...) Expand 10 before | Expand all | Expand 10 after
205 content::NotificationRegistrar registrar_; 205 content::NotificationRegistrar registrar_;
206 206
207 base::OneShotTimer<WallpaperManager> timer_; 207 base::OneShotTimer<WallpaperManager> timer_;
208 208
209 DISALLOW_COPY_AND_ASSIGN(WallpaperManager); 209 DISALLOW_COPY_AND_ASSIGN(WallpaperManager);
210 }; 210 };
211 211
212 } // namespace chromeos 212 } // namespace chromeos
213 213
214 #endif // CHROME_BROWSER_CHROMEOS_LOGIN_WALLPAPER_MANAGER_H_ 214 #endif // CHROME_BROWSER_CHROMEOS_LOGIN_WALLPAPER_MANAGER_H_
OLDNEW
« no previous file with comments | « no previous file | chrome/browser/chromeos/login/wallpaper_manager.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698