components/policy/core/browser/android/android_combined_policy_provider.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/android/android_combined_policy_provider.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

Index: components/policy/core/browser/android/android_combined_policy_provider.h

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

index 7c4706ce9783ffd3582bd4982af47409e2486fe4..2433b7f480da9a89d5ead3f574ec9755d87184e9 100644

--- a/components/policy/core/browser/android/android_combined_policy_provider.h

+++ b/components/policy/core/browser/android/android_combined_policy_provider.h

@@ -7,9 +7,10 @@

#include <jni.h>

+#include <memory>

#include "base/android/scoped_java_ref.h"

#include "base/macros.h"

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

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

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

#include "components/policy/policy_export.h"

@@ -54,7 +55,7 @@ class POLICY_EXPORT AndroidCombinedPolicyProvider

private:

bool initialized_;

- scoped_ptr<policy::android::PolicyConverter> policy_converter_;

+ std::unique_ptr<policy::android::PolicyConverter> policy_converter_;

base::android::ScopedJavaGlobalRef<jobject> java_combined_policy_provider_;

« no previous file with comments | « no previous file | components/policy/core/browser/android/policy_converter.h » ('j') | no next file with comments »