chrome/browser/chromeos/login/users/avatar/user_image_sync_observer.cc - Issue 402133003: [cros, user_manager] Move default user images constants and helper functions out of src/chrome.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: chrome/browser/chromeos/login/users/avatar/user_image_sync_observer.cc

Issue 402133003: [cros, user_manager] Move default user images constants and helper functions out of src/chrome. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: re-format 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 | « chrome/browser/chromeos/login/users/avatar/user_image_manager_impl.cc ('k') | chrome/browser/chromeos/login/users/user.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/chromeos/login/users/avatar/user_image_sync_observer.cc

diff --git a/chrome/browser/chromeos/login/users/avatar/user_image_sync_observer.cc b/chrome/browser/chromeos/login/users/avatar/user_image_sync_observer.cc

index 259af05ca7f9d5df4972babf433a9a5afdf86002..846a08d89924f9e5533a22a5eeba65c74ab39f1d 100644

--- a/chrome/browser/chromeos/login/users/avatar/user_image_sync_observer.cc

+++ b/chrome/browser/chromeos/login/users/avatar/user_image_sync_observer.cc

@@ -10,7 +10,6 @@

#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"

@@ -19,6 +18,7 @@

#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,8 +31,9 @@ const char kUserImageInfo[] = "user_image_info";

const char kImageIndex[] = "image_index";

bool IsIndexSupported(int index) {

- return (index >= kFirstDefaultImageIndex && index < kDefaultImagesCount) ||

- (index == User::kProfileImageIndex);

+ return (index >= user_manager::kFirstDefaultImageIndex &&

+ index < user_manager::kDefaultImagesCount) ||

+ (index == User::kProfileImageIndex);

}

Profile* GetUserProfile() {