chrome/browser/chromeos/settings/device_settings_provider.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/settings/device_settings_provider.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/settings/cros_settings.cc ('k') | chrome/browser/chromeos/settings/device_settings_service.h » ('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/settings/device_settings_provider.cc

diff --git a/chrome/browser/chromeos/settings/device_settings_provider.cc b/chrome/browser/chromeos/settings/device_settings_provider.cc

index 05fe7685787a0ef60137c7d61d47656e164ad463..719e9197dfc75e2942ad8fbfc2630eb2095716a4 100644

--- a/chrome/browser/chromeos/settings/device_settings_provider.cc

+++ b/chrome/browser/chromeos/settings/device_settings_provider.cc

@@ -519,7 +519,7 @@ void DeviceSettingsProvider::DoSet(const std::string& path,

OwnerSettingsServiceChromeOS::UpdateDeviceSettings(

path, in_value, device_settings_);

em::PolicyData data;

- data.set_username(device_settings_service_->GetUsername());

+ data.set_username(device_settings_service_->GetUserID().GetUserEmail());

CHECK(device_settings_.SerializeToString(data.mutable_policy_value()));

// Set the cache to the updated value.

@@ -566,7 +566,7 @@ void DeviceSettingsProvider::OwnershipStatusChanged() {

}

scoped_ptr<em::PolicyData> policy(new em::PolicyData());

- policy->set_username(device_settings_service_->GetUsername());

+ policy->set_username(device_settings_service_->GetUserID().GetUserEmail());

CHECK(device_settings_.SerializeToString(policy->mutable_policy_value()));

if (!device_settings_service_->GetOwnerSettingsService()

->CommitTentativeDeviceSettings(policy.Pass())) {