chrome/browser/chromeos/policy/user_cloud_policy_store_chromeos.h - 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/policy/user_cloud_policy_store_chromeos.h

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/policy/user_cloud_policy_manager_factory_chromeos.cc ('k') | chrome/browser/chromeos/policy/user_cloud_policy_store_chromeos.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/policy/user_cloud_policy_store_chromeos.h

diff --git a/chrome/browser/chromeos/policy/user_cloud_policy_store_chromeos.h b/chrome/browser/chromeos/policy/user_cloud_policy_store_chromeos.h

index 9d7a2cdf31d5df5088aafa9a60a39e994f0dd514..9d296922f9f097011f8b9764d09431e83b32b2b1 100644

--- a/chrome/browser/chromeos/policy/user_cloud_policy_store_chromeos.h

+++ b/chrome/browser/chromeos/policy/user_cloud_policy_store_chromeos.h

@@ -17,6 +17,7 @@

#include "chromeos/dbus/dbus_method_call_status.h"

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

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

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

namespace base {

class SequencedTaskRunner;

@@ -44,7 +45,7 @@ class UserCloudPolicyStoreChromeOS : public UserCloudPolicyStoreBase {

chromeos::CryptohomeClient* cryptohome_client,

chromeos::SessionManagerClient* session_manager_client,

scoped_refptr<base::SequencedTaskRunner> background_task_runner,

- const std::string& username,

+ const user_manager::UserID& user_id,

const base::FilePath& user_policy_key_dir,

const base::FilePath& legacy_token_cache_file,

const base::FilePath& legacy_policy_cache_file);

@@ -124,7 +125,7 @@ class UserCloudPolicyStoreChromeOS : public UserCloudPolicyStoreBase {

chromeos::CryptohomeClient* cryptohome_client_;

chromeos::SessionManagerClient* session_manager_client_;

- const std::string username_;

+ const user_manager::UserID user_id_;

base::FilePath user_policy_key_dir_;

// TODO(mnissler): Remove all the legacy policy support members below after