chrome/browser/chromeos/login/mock_user_manager.h - Issue 23095006: If user profile doesn't contain language setting, default to his Google account settings.

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/mock_user_manager.h

Issue 23095006: If user profile doesn't contain language setting, default to his Google account settings. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Fix Multi Profile support. Created 7 years, 3 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/mock_user_manager.h

diff --git a/chrome/browser/chromeos/login/mock_user_manager.h b/chrome/browser/chromeos/login/mock_user_manager.h

index 0901f56ed7e016d03583278ba2abe44cdaba90c0..90e632e442b114018aa0d23efb1f3011b837ca5e 100644

--- a/chrome/browser/chromeos/login/mock_user_manager.h

+++ b/chrome/browser/chromeos/login/mock_user_manager.h

@@ -42,6 +42,8 @@ class MockUserManager : public UserManager {

User::OAuthTokenStatus));

MOCK_METHOD2(SaveUserDisplayName, void(const std::string&,

const string16&));

+ MOCK_METHOD3(UpdateUserAccountData,

+ void(const std::string&, const string16&, const std::string&));

MOCK_CONST_METHOD1(GetUserDisplayName, string16(const std::string&));

MOCK_METHOD2(SaveUserDisplayEmail, void(const std::string&,

const std::string&));

@@ -105,6 +107,7 @@ class MockUserManager : public UserManager {

virtual User* GetLoggedInUser() OVERRIDE;

virtual const User* GetActiveUser() const OVERRIDE;

virtual User* GetActiveUser() OVERRIDE;

+ virtual const User* GetPrimaryUser() const OVERRIDE;

virtual UserImageManager* GetUserImageManager() OVERRIDE;

« no previous file with comments | « chrome/browser/chromeos/login/login_utils.cc ('k') | chrome/browser/chromeos/login/mock_user_manager.cc » ('j') | ui/base/l10n/l10n_util.h » ('J')