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

Unified Diff: trunk/src/chrome/browser/chromeos/login/users/user.cc

Issue 408833004: Revert 284417 "Move default user profile images strings and reso..." (Closed) Base URL: svn://svn.chromium.org/chrome/
Patch Set: 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
« no previous file with comments | « trunk/src/chrome/browser/chromeos/login/users/user.h ('k') | trunk/src/chrome/browser/supervised_user/DEPS » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: trunk/src/chrome/browser/chromeos/login/users/user.cc
===================================================================
--- trunk/src/chrome/browser/chromeos/login/users/user.cc (revision 284418)
+++ trunk/src/chrome/browser/chromeos/login/users/user.cc (working copy)
@@ -8,9 +8,9 @@
#include "base/strings/stringprintf.h"
#include "base/strings/utf_string_conversions.h"
#include "base/threading/thread_restrictions.h"
+#include "chrome/browser/chromeos/login/users/avatar/default_user_images.h"
#include "chrome/browser/chromeos/login/users/user_manager.h"
#include "chromeos/login/user_names.h"
-#include "components/user_manager/user_image/default_user_images.h"
#include "google_apis/gaia/gaia_auth_util.h"
#include "grit/theme_resources.h"
#include "ui/base/resource/resource_bundle.h"
@@ -139,7 +139,7 @@
}
bool User::HasDefaultImage() const {
- return image_index_ >= 0 && image_index_ < user_manager::kDefaultImagesCount;
+ return image_index_ >= 0 && image_index_ < kDefaultImagesCount;
}
bool User::CanSyncImage() const {
« no previous file with comments | « trunk/src/chrome/browser/chromeos/login/users/user.h ('k') | trunk/src/chrome/browser/supervised_user/DEPS » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698