chrome/browser/chromeos/login/enrollment/enterprise_enrollment_helper.h - Issue 1870793002: Convert //chrome/browser/chromeos 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: chrome/browser/chromeos/login/enrollment/enterprise_enrollment_helper.h

Issue 1870793002: Convert //chrome/browser/chromeos from scoped_ptr to std::unique_ptr (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: rebase 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 | « chrome/browser/chromeos/login/enrollment/enrollment_screen.h ('k') | chrome/browser/chromeos/login/enrollment/enterprise_enrollment_helper.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/chromeos/login/enrollment/enterprise_enrollment_helper.h

diff --git a/chrome/browser/chromeos/login/enrollment/enterprise_enrollment_helper.h b/chrome/browser/chromeos/login/enrollment/enterprise_enrollment_helper.h

index 070901b4a28f9c23e6726d3fd16afc060908d189..cd9cb8fd08348ab81925d5396234ec1d2d26f963 100644

--- a/chrome/browser/chromeos/login/enrollment/enterprise_enrollment_helper.h

+++ b/chrome/browser/chromeos/login/enrollment/enterprise_enrollment_helper.h

@@ -5,11 +5,11 @@

#ifndef CHROME_BROWSER_CHROMEOS_LOGIN_ENROLLMENT_ENTERPRISE_ENROLLMENT_HELPER_H_

#define CHROME_BROWSER_CHROMEOS_LOGIN_ENROLLMENT_ENTERPRISE_ENROLLMENT_HELPER_H_

+#include <memory>

#include <string>

#include "base/callback_forward.h"

#include "base/macros.h"

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

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

class GoogleServiceAuthError;

@@ -67,7 +67,7 @@ class EnterpriseEnrollmentHelper {

};

// Factory method. Caller takes ownership of the returned object.

- static scoped_ptr<EnterpriseEnrollmentHelper> Create(

+ static std::unique_ptr<EnterpriseEnrollmentHelper> Create(

EnrollmentStatusConsumer* status_consumer,

const policy::EnrollmentConfig& enrollment_config,

const std::string& enrolling_user_domain);