chrome/browser/chromeos/policy/device_local_account_policy_store.cc - Issue 494093002: OwnerKeyUtil is moved to components/ownership.

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/device_local_account_policy_store.cc

Issue 494093002: OwnerKeyUtil is moved to components/ownership. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Rebase. Created 6 years, 4 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/chrome_browser_main_chromeos.cc ('K') | « chrome/browser/chromeos/policy/device_cloud_policy_store_chromeos.cc ('k') | chrome/browser/chromeos/settings/device_settings_service.h » ('j') | components/ownership.gypi » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/chromeos/policy/device_local_account_policy_store.cc

diff --git a/chrome/browser/chromeos/policy/device_local_account_policy_store.cc b/chrome/browser/chromeos/policy/device_local_account_policy_store.cc

index b2c520a3883426a27927a586f0602b45428a194c..da6c46098236c0f6089aa93c1644a55cdb96d426 100644

--- a/chrome/browser/chromeos/policy/device_local_account_policy_store.cc

+++ b/chrome/browser/chromeos/policy/device_local_account_policy_store.cc

@@ -8,8 +8,8 @@

#include "base/callback.h"

#include "chrome/browser/browser_process.h"

#include "chrome/browser/chromeos/policy/browser_policy_connector_chromeos.h"

-#include "chrome/browser/chromeos/settings/owner_key_util.h"

#include "chromeos/dbus/session_manager_client.h"

+#include "components/ownership/owner_key_util.h"

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

#include "components/policy/core/common/external_data_fetcher.h"

#include "components/policy/core/common/policy_map.h"

@@ -139,7 +139,7 @@ void DeviceLocalAccountPolicyStore::Validate(

ownership_status);

const em::PolicyData* device_policy_data =

device_settings_service_->policy_data();

- scoped_refptr<chromeos::PublicKey> key =

+ scoped_refptr<ownership::PublicKey> key =

device_settings_service_->GetPublicKey();

if (!key || !key->is_loaded() || !device_policy_data) {

status_ = CloudPolicyStore::STATUS_BAD_STATE;