chrome/browser/chromeos/login/users/wallpaper/wallpaper_manager.cc - Issue 1693383003: ChromeOS cryptohome should be able to use gaia id as user identifier.

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/wallpaper/wallpaper_manager.cc

Issue 1693383003: ChromeOS cryptohome should be able to use gaia id as user identifier. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Fixed unit tests. Created 4 years, 10 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/chromeos/login/users/fake_chrome_user_manager.cc ('k') | chrome/browser/chromeos/login/users/wallpaper/wallpaper_manager_policy_browsertest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/chromeos/login/users/wallpaper/wallpaper_manager.cc

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

index 15f321d39e12c957d54128b87e3b8986e0b79bab..edfcc68a8610d7e47e64c87daa9f681c538c96d1 100644

--- a/chrome/browser/chromeos/login/users/wallpaper/wallpaper_manager.cc

+++ b/chrome/browser/chromeos/login/users/wallpaper/wallpaper_manager.cc

@@ -40,6 +40,7 @@

#include "chrome/common/pref_names.h"

#include "chromeos/chromeos_switches.h"

#include "chromeos/cryptohome/async_method_caller.h"

+#include "chromeos/cryptohome/cryptohome_parameters.h"

#include "chromeos/dbus/dbus_thread_manager.h"

#include "chromeos/login/user_names.h"

#include "components/prefs/pref_registry_simple.h"

@@ -805,7 +806,7 @@ void WallpaperManager::SetPolicyControlledWallpaper(

if (user->username_hash().empty()) {

cryptohome::AsyncMethodCaller::GetInstance()->AsyncGetSanitizedUsername(

- account_id.GetUserEmail(),

+ cryptohome::Identification(account_id),

base::Bind(&WallpaperManager::SetCustomWallpaperOnSanitizedUsername,

weak_factory_.GetWeakPtr(), account_id, user_image.image(),

true /* update wallpaper */));