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

Unified Diff: chrome/browser/ui/webui/options/chromeos/user_image_source.cc

Issue 398753004: [cros] Move User class to user_manager component. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebase Created 6 years, 5 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 side-by-side diff with in-line comments
Download patch
Index: chrome/browser/ui/webui/options/chromeos/user_image_source.cc
diff --git a/chrome/browser/ui/webui/options/chromeos/user_image_source.cc b/chrome/browser/ui/webui/options/chromeos/user_image_source.cc
index 6ad87bee6b00fac02cdc8888fb8654d6db7beab5..a5c0a62b9ea29ca27b415d9ca6e5e6124ed329ff 100644
--- a/chrome/browser/ui/webui/options/chromeos/user_image_source.cc
+++ b/chrome/browser/ui/webui/options/chromeos/user_image_source.cc
@@ -55,7 +55,8 @@ base::RefCountedMemory* UserImageSource::GetUserImage(
const std::string& email,
bool is_image_animated,
ui::ScaleFactor scale_factor) const {
- const chromeos::User* user = chromeos::UserManager::Get()->FindUser(email);
+ const user_manager::User* user =
+ chromeos::UserManager::Get()->FindUser(email);
if (user) {
if (user->has_animated_image() && is_image_animated) {
return new base::RefCountedBytes(user->animated_image());
@@ -109,7 +110,8 @@ std::string UserImageSource::GetMimeType(const std::string& path) const {
ParseRequest(url, &email, &is_image_animated);
if (is_image_animated) {
- const chromeos::User* user = chromeos::UserManager::Get()->FindUser(email);
+ const user_manager::User* user =
+ chromeos::UserManager::Get()->FindUser(email);
if (user && user->has_animated_image())
return "image/gif";
}
« no previous file with comments | « chrome/browser/ui/webui/options/chromeos/shared_options_browsertest.cc ('k') | chrome/chrome_browser_chromeos.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698