components/user_manager/user_info_impl.h - Issue 1440583002: This CL replaces e-mail with AccountId on user selection screen.

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: components/user_manager/user_info_impl.h

Issue 1440583002: This CL replaces e-mail with AccountId on user selection screen. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Fix tests. Created 5 years, 1 month 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

« components/signin/core/account_id/account_id.cc ('K') | « components/user_manager/user_info.h ('k') | components/user_manager/user_info_impl.cc » ('j') | components/user_manager/user_manager_base.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: components/user_manager/user_info_impl.h

diff --git a/components/user_manager/user_info_impl.h b/components/user_manager/user_info_impl.h

index 4922e3694c55e2781a707ca98bf5c4d69e8fb979..d2733ebf5ba889a862a3365317f36231a470b37b 100644

--- a/components/user_manager/user_info_impl.h

+++ b/components/user_manager/user_info_impl.h

@@ -8,6 +8,7 @@

#include <string>

#include "base/strings/string16.h"

+#include "components/signin/core/account_id/account_id.h"

#include "components/user_manager/user_info.h"

#include "components/user_manager/user_manager_export.h"

#include "ui/gfx/image/image_skia.h"

@@ -24,10 +25,11 @@ class USER_MANAGER_EXPORT UserInfoImpl : public UserInfo {

base::string16 GetDisplayName() const override;

base::string16 GetGivenName() const override;

std::string GetEmail() const override;

- AccountId GetAccountId() const override;

+ const AccountId& GetAccountId() const override;

const gfx::ImageSkia& GetImage() const override;

private:

+ const AccountId account_id_;

gfx::ImageSkia user_image_;

DISALLOW_COPY_AND_ASSIGN(UserInfoImpl);