chrome/browser/ui/webui/chromeos/login/user_image_screen_handler.cc - Issue 398753004: [cros] Move User class to user_manager component.

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/ui/webui/chromeos/login/user_image_screen_handler.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

« no previous file with comments | « chrome/browser/ui/webui/chromeos/login/supervised_user_creation_screen_handler.cc ('k') | chrome/browser/ui/webui/net_internals/DEPS » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/ui/webui/chromeos/login/user_image_screen_handler.cc

diff --git a/chrome/browser/ui/webui/chromeos/login/user_image_screen_handler.cc b/chrome/browser/ui/webui/chromeos/login/user_image_screen_handler.cc

index 119ab440a629ec6d23a2893691c9762f862dcef5..587b4b7cfd4dbe4d23d2dc6b6cfffb0d838fba9c 100644

--- a/chrome/browser/ui/webui/chromeos/login/user_image_screen_handler.cc

+++ b/chrome/browser/ui/webui/chromeos/login/user_image_screen_handler.cc

@@ -11,11 +11,11 @@

#include "base/values.h"

#include "chrome/browser/chromeos/login/existing_user_controller.h"

#include "chrome/browser/chromeos/login/ui/webui_login_display.h"

-#include "chrome/browser/chromeos/login/users/user.h"

#include "chrome/browser/ui/webui/chromeos/login/oobe_ui.h"

#include "chrome/common/chrome_switches.h"

#include "chrome/common/url_constants.h"

#include "chromeos/audio/chromeos_sounds.h"

+#include "components/user_manager/user.h"

#include "components/user_manager/user_image/default_user_images.h"

#include "grit/browser_resources.h"

#include "grit/generated_resources.h"

@@ -159,7 +159,7 @@ void UserImageScreenHandler::HandleGetImages() {

CallJS("setDefaultImages", image_urls);

if (!screen_)

return;

- if (screen_->selected_image() != User::kInvalidImageIndex)

+ if (screen_->selected_image() != user_manager::User::USER_IMAGE_INVALID)

SelectImage(screen_->selected_image());

if (screen_->profile_picture_data_url() != url::kAboutBlankURL)