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

Unified Diff: trunk/src/chrome/browser/chromeos/login/users/avatar/user_image_sync_observer.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
Index: trunk/src/chrome/browser/chromeos/login/users/avatar/user_image_sync_observer.cc
===================================================================
--- trunk/src/chrome/browser/chromeos/login/users/avatar/user_image_sync_observer.cc (revision 284418)
+++ trunk/src/chrome/browser/chromeos/login/users/avatar/user_image_sync_observer.cc (working copy)
@@ -10,6 +10,7 @@
#include "chrome/browser/browser_process.h"
#include "chrome/browser/chrome_notification_types.h"
#include "chrome/browser/chromeos/login/screens/user_image_screen.h"
+#include "chrome/browser/chromeos/login/users/avatar/default_user_images.h"
#include "chrome/browser/chromeos/login/users/avatar/user_image_manager.h"
#include "chrome/browser/chromeos/login/users/user.h"
#include "chrome/browser/chromeos/login/wizard_controller.h"
@@ -18,7 +19,6 @@
#include "chrome/browser/profiles/profile.h"
#include "chrome/browser/profiles/profile_manager.h"
#include "chrome/common/pref_names.h"
-#include "components/user_manager/user_image/default_user_images.h"
#include "content/public/browser/notification_registrar.h"
#include "content/public/browser/notification_service.h"
@@ -31,9 +31,8 @@
const char kImageIndex[] = "image_index";
bool IsIndexSupported(int index) {
- return (index >= user_manager::kFirstDefaultImageIndex &&
- index < user_manager::kDefaultImagesCount) ||
- (index == User::kProfileImageIndex);
+ return (index >= kFirstDefaultImageIndex && index < kDefaultImagesCount) ||
+ (index == User::kProfileImageIndex);
}
Profile* GetUserProfile() {

Powered by Google App Engine
This is Rietveld 408576698