chrome/browser/chromeos/system/device_disabling_manager.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/system/device_disabling_manager.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/system/device_disabling_browsertest.cc ('k') | chrome/browser/chromeos/system/device_disabling_manager_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/chromeos/system/device_disabling_manager.h

diff --git a/chrome/browser/chromeos/system/device_disabling_manager.h b/chrome/browser/chromeos/system/device_disabling_manager.h

index 3734632288e14c29afb386c2914aed63ad97d16d..c8e7ebaa7b27b3b0698cde3a7b2429ab84127a8d 100644

--- a/chrome/browser/chromeos/system/device_disabling_manager.h

+++ b/chrome/browser/chromeos/system/device_disabling_manager.h

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

#ifndef CHROME_BROWSER_CHROMEOS_SYSTEM_DEVICE_DISABLING_MANAGER_H_

#define CHROME_BROWSER_CHROMEOS_SYSTEM_DEVICE_DISABLING_MANAGER_H_

+#include <memory>

#include <string>

#include "base/callback.h"

#include "base/macros.h"

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

#include "base/memory/weak_ptr.h"

#include "base/observer_list.h"

#include "chrome/browser/chromeos/settings/cros_settings.h"

@@ -121,8 +121,10 @@ class DeviceDisablingManager {

base::ObserverList<Observer> observers_;

- scoped_ptr<CrosSettings::ObserverSubscription> device_disabled_subscription_;

- scoped_ptr<CrosSettings::ObserverSubscription> disabled_message_subscription_;

+ std::unique_ptr<CrosSettings::ObserverSubscription>

+ device_disabled_subscription_;

+ std::unique_ptr<CrosSettings::ObserverSubscription>

+ disabled_message_subscription_;

// Indicates whether the device was disabled when the cros settings were last

// read.