chrome/browser/ui/webui/options/browser_options_handler.cc - Issue 1497973002: This CL replaces e-mail with AccountId in wallpaper manager code.

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/options/browser_options_handler.cc

Issue 1497973002: This CL replaces e-mail with AccountId in wallpaper manager code. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Created 5 years 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

« chrome/browser/ui/webui/chromeos/login/gaia_screen_handler.cc ('K') | « chrome/browser/ui/webui/chromeos/login/supervised_user_creation_screen_handler.cc ('k') | components/wallpaper/wallpaper_manager_base.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/ui/webui/options/browser_options_handler.cc

diff --git a/chrome/browser/ui/webui/options/browser_options_handler.cc b/chrome/browser/ui/webui/options/browser_options_handler.cc

index 19d3233ae850facf2b8a4bb2c48d3a4c5ae56e26..bfcc914478fa4bc7abe3d5e1df30a25d5eccd3a4 100644

--- a/chrome/browser/ui/webui/options/browser_options_handler.cc

+++ b/chrome/browser/ui/webui/options/browser_options_handler.cc

@@ -1027,7 +1027,7 @@ void BrowserOptionsHandler::InitializePage() {

OnWallpaperManagedChanged(

chromeos::WallpaperManager::Get()->IsPolicyControlled(

- user_manager::UserManager::Get()->GetActiveUser()->email()));

+ user_manager::UserManager::Get()->GetActiveUser()->GetAccountId()));

policy::ConsumerManagementService* consumer_management =

g_browser_process->platform_part()->browser_policy_connector_chromeos()->