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

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: Add missing files. 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

« chrome/browser/chromeos/login/wizard_controller.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/chromeos/policy/user_cloud_policy_store_chromeos.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 edf34d8939655ed6aefe78974ed5a4a158a82c6c..db43914c9bf9c0642cbac282feeb87ee625e73c0 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/signin/core/account_id/account_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 AccountId& account_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 AccountId& account_id_;

xiyuan 2016/02/17 23:14:25 Is it intentional to store a ref here? Are we sure

Alexander Alekseev 2016/02/18 13:45:14 This was "automatic substitution error". Fixed.

base::FilePath user_policy_key_dir_;

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