chrome/browser/chromeos/policy/device_cloud_policy_store_chromeos.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_cloud_policy_store_chromeos.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/ownership/owner_settings_service.cc ('k') | chrome/browser/chromeos/policy/device_local_account_policy_store.cc » ('j') | components/ownership.gypi » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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

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

index 2136a10ccc3a6581ca7fd529266e94ec13aa32c4..f149e8ac58baaf156c89472bd1272e23360e030a 100644

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

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

@@ -12,7 +12,7 @@

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

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

#include "chrome/browser/chromeos/policy/proto/chrome_device_policy.pb.h"

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

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

#include "policy/proto/device_management_backend.pb.h"

namespace em = enterprise_management;

@@ -40,7 +40,7 @@ void DeviceCloudPolicyStoreChromeOS::Store(

// Cancel all pending requests.

weak_factory_.InvalidateWeakPtrs();

- scoped_refptr<chromeos::PublicKey> public_key(

+ scoped_refptr<ownership::PublicKey> public_key(

device_settings_service_->GetPublicKey());

if (!install_attributes_->IsEnterpriseDevice() ||

!device_settings_service_->policy_data() || !public_key.get() ||