components/policy/core/browser/configuration_policy_pref_store.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/browser/configuration_policy_pref_store.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/browser/configuration_policy_handler_unittest.cc ('k') | components/policy/core/browser/configuration_policy_pref_store.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: components/policy/core/browser/configuration_policy_pref_store.h

diff --git a/components/policy/core/browser/configuration_policy_pref_store.h b/components/policy/core/browser/configuration_policy_pref_store.h

index a410427bb6c65c3f6471adc284a76c79b538b660..3d1ef9a2579d467e30861525ee9be2f40003ee70 100644

--- a/components/policy/core/browser/configuration_policy_pref_store.h

+++ b/components/policy/core/browser/configuration_policy_pref_store.h

@@ -5,10 +5,10 @@

#ifndef COMPONENTS_POLICY_CORE_BROWSER_CONFIGURATION_POLICY_PREF_STORE_H_

#define COMPONENTS_POLICY_CORE_BROWSER_CONFIGURATION_POLICY_PREF_STORE_H_

+#include <memory>

#include <string>

#include "base/macros.h"

-#include "base/memory/scoped_ptr.h"

#include "base/observer_list.h"

#include "base/values.h"

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

@@ -73,7 +73,7 @@ class POLICY_EXPORT ConfigurationPolicyPrefStore

PolicyLevel level_;

// Current policy preferences.

- scoped_ptr<PrefValueMap> prefs_;

+ std::unique_ptr<PrefValueMap> prefs_;

base::ObserverList<PrefStore::Observer, true> observers_;