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

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

Issue 10830111: [cros] Encode user images when set from WebUI (regression fix). (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Review fixes 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
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/desktop_background/desktop_background_resources.h" 8 #include "ash/desktop_background/desktop_background_resources.h"
9 #include "ash/shell.h" 9 #include "ash/shell.h"
10 #include "base/logging.h" 10 #include "base/logging.h"
(...skipping 95 matching lines...) Expand 10 before | Expand all | Expand 10 after
106 } 106 }
107 107
108 void WallpaperManager::SetLastSelectedUser( 108 void WallpaperManager::SetLastSelectedUser(
109 const std::string& last_selected_user) { 109 const std::string& last_selected_user) {
110 last_selected_user_ = last_selected_user; 110 last_selected_user_ = last_selected_user;
111 } 111 }
112 112
113 void WallpaperManager::SetWallpaperFromFilePath(const std::string& path, 113 void WallpaperManager::SetWallpaperFromFilePath(const std::string& path,
114 ash::WallpaperLayout layout) { 114 ash::WallpaperLayout layout) {
115 image_loader_->Start( 115 image_loader_->Start(
116 path, 0, false, 116 path, 0,
117 base::Bind(&WallpaperManager::OnWallpaperLoaded, 117 base::Bind(&WallpaperManager::OnWallpaperLoaded,
118 base::Unretained(this), layout)); 118 base::Unretained(this), layout));
119 } 119 }
120 120
121 void WallpaperManager::SetWallpaperFromImageSkia( 121 void WallpaperManager::SetWallpaperFromImageSkia(
122 const gfx::ImageSkia& wallpaper, 122 const gfx::ImageSkia& wallpaper,
123 ash::WallpaperLayout layout) { 123 ash::WallpaperLayout layout) {
124 ash::Shell::GetInstance()->desktop_background_controller()-> 124 ash::Shell::GetInstance()->desktop_background_controller()->
125 SetCustomWallpaper(wallpaper, layout); 125 SetCustomWallpaper(wallpaper, layout);
126 } 126 }
(...skipping 69 matching lines...) Expand 10 before | Expand all | Expand 10 after
196 196
197 void WallpaperManager::SystemResumed() { 197 void WallpaperManager::SystemResumed() {
198 BatchUpdateWallpaper(); 198 BatchUpdateWallpaper();
199 } 199 }
200 200
201 void WallpaperManager::TimezoneChanged(const icu::TimeZone& timezone) { 201 void WallpaperManager::TimezoneChanged(const icu::TimeZone& timezone) {
202 RestartTimer(); 202 RestartTimer();
203 } 203 }
204 204
205 } // chromeos 205 } // chromeos
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698