chrome/browser/chromeos/login/enrollment/auto_enrollment_check_screen.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/auto_enrollment_check_screen.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/enable_debugging_browsertest.cc ('k') | chrome/browser/chromeos/login/enrollment/auto_enrollment_controller.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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

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

index 292e5a73d098bdf009e435076a83b6be9c12c273..c68b8a777040cb4b01a399b01c70712f32edcc43 100644

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

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

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

#ifndef CHROME_BROWSER_CHROMEOS_LOGIN_ENROLLMENT_AUTO_ENROLLMENT_CHECK_SCREEN_H_

#define CHROME_BROWSER_CHROMEOS_LOGIN_ENROLLMENT_AUTO_ENROLLMENT_CHECK_SCREEN_H_

+#include <memory>

#include "base/compiler_specific.h"

#include "base/macros.h"

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

#include "base/memory/weak_ptr.h"

#include "chrome/browser/chromeos/login/enrollment/auto_enrollment_check_screen_actor.h"

#include "chrome/browser/chromeos/login/enrollment/auto_enrollment_controller.h"

@@ -94,13 +95,13 @@ class AutoEnrollmentCheckScreen

AutoEnrollmentCheckScreenActor* actor_;

AutoEnrollmentController* auto_enrollment_controller_;

- scoped_ptr<AutoEnrollmentController::ProgressCallbackList::Subscription>

+ std::unique_ptr<AutoEnrollmentController::ProgressCallbackList::Subscription>

auto_enrollment_progress_subscription_;

NetworkPortalDetector::CaptivePortalStatus captive_portal_status_;

policy::AutoEnrollmentState auto_enrollment_state_;

- scoped_ptr<ErrorScreensHistogramHelper> histogram_helper_;

+ std::unique_ptr<ErrorScreensHistogramHelper> histogram_helper_;

ErrorScreen::ConnectRequestCallbackSubscription connect_request_subscription_;