chrome/browser/chromeos/login/users/user.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/user.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

Index: chrome/browser/chromeos/login/users/user.cc

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

index 66e12caf4f17025a7407233b43c771415806c487..a515465250fb86ac69ab1152aea756d10f6f6f44 100644

--- a/chrome/browser/chromeos/login/users/user.cc

+++ b/chrome/browser/chromeos/login/users/user.cc

@@ -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 @@ std::string User::GetAccountName(bool use_display_email) const {

}

bool User::HasDefaultImage() const {

- return image_index_ >= 0 && image_index_ < kDefaultImagesCount;

+ return image_index_ >= 0 && image_index_ < user_manager::kDefaultImagesCount;

}

bool User::CanSyncImage() const {

« no previous file with comments | « chrome/browser/chromeos/login/users/user.h ('k') | chrome/browser/supervised_user/DEPS » ('j') | no next file with comments »