chrome/browser/chromeos/platform_keys/platform_keys_nss.cc - Issue 1165323004: We should use UserID object to identify users instead of username.

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/platform_keys/platform_keys_nss.cc

Issue 1165323004: We should use UserID object to identify users instead of username. Base URL: https://chromium.googlesource.com/chromium/src.git@master

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

« chrome/browser/chromeos/ownership/owner_settings_service_chromeos.cc ('K') | « chrome/browser/chromeos/ownership/owner_settings_service_chromeos.cc ('k') | chrome/browser/chromeos/policy/affiliated_invalidation_service_provider_impl.cc » ('j') | chrome/browser/extensions/api/enterprise_platform_keys_private/enterprise_platform_keys_private_api.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/chromeos/platform_keys/platform_keys_nss.cc

diff --git a/chrome/browser/chromeos/platform_keys/platform_keys_nss.cc b/chrome/browser/chromeos/platform_keys/platform_keys_nss.cc

index d6887d5f8152ef4bcec69804e27ac2da96f4d23d..af0d78466bf483b3787fd45ece66189ad9b0f989 100644

--- a/chrome/browser/chromeos/platform_keys/platform_keys_nss.cc

+++ b/chrome/browser/chromeos/platform_keys/platform_keys_nss.cc

@@ -29,6 +29,7 @@

#include "chrome/browser/net/nss_context.h"

#include "chrome/browser/profiles/profile.h"

#include "components/policy/core/common/cloud/cloud_policy_constants.h"

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

#include "content/public/browser/browser_context.h"

#include "content/public/browser/browser_thread.h"

#include "crypto/nss_key_util.h"

@@ -781,7 +782,7 @@ void SelectClientCertificates(

// domain as the device is registered to.

policy::BrowserPolicyConnectorChromeOS* connector =

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

- bool use_system_key_slot = connector->GetUserAffiliation(user->email()) ==

+ bool use_system_key_slot = connector->GetUserAffiliation(user->GetUserID()) ==

policy::USER_AFFILIATION_MANAGED;

scoped_ptr<SelectCertificatesState> state(new SelectCertificatesState(