components/policy/core/common/policy_loader_mac.h - Issue 1902633006: Convert //components/policy from scoped_ptr to std::unique_ptr

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: components/policy/core/common/policy_loader_mac.h

Issue 1902633006: Convert //components/policy from scoped_ptr to std::unique_ptr (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Address comments and use namespace alias Created 4 years, 8 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

« no previous file with comments | « components/policy/core/common/policy_loader_ios_unittest.mm ('k') | components/policy/core/common/policy_loader_mac.mm » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: components/policy/core/common/policy_loader_mac.h

diff --git a/components/policy/core/common/policy_loader_mac.h b/components/policy/core/common/policy_loader_mac.h

index d6eddb8492518cd2b3decd11a9233349021102af..216b021dca8bcf2e16e0b9f307c4ea3d05821b5a 100644

--- a/components/policy/core/common/policy_loader_mac.h

+++ b/components/policy/core/common/policy_loader_mac.h

@@ -47,7 +47,7 @@ class POLICY_EXPORT PolicyLoaderMac : public AsyncPolicyLoader {

// AsyncPolicyLoader implementation.

void InitOnBackgroundThread() override;

- scoped_ptr<PolicyBundle> Load() override;

+ std::unique_ptr<PolicyBundle> Load() override;

base::Time LastModificationTime() override;

#if defined(OS_MACOSX) && !defined(OS_IOS)

@@ -74,7 +74,7 @@ class POLICY_EXPORT PolicyLoaderMac : public AsyncPolicyLoader {

const Schema& schema,

PolicyMap* policy);

- scoped_ptr<MacPreferences> preferences_;

+ std::unique_ptr<MacPreferences> preferences_;

// Path to the managed preferences file for the current user, if it could

// be found. Updates of this file trigger a policy reload.

« no previous file with comments | « components/policy/core/common/policy_loader_ios_unittest.mm ('k') | components/policy/core/common/policy_loader_mac.mm » ('j') | no next file with comments »