Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(3385)

Unified Diff: chrome/browser/chromeos/login/screens/hid_detection_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
Index: chrome/browser/chromeos/login/screens/hid_detection_screen.h
diff --git a/chrome/browser/chromeos/login/screens/hid_detection_screen.h b/chrome/browser/chromeos/login/screens/hid_detection_screen.h
index 4f6e3e14c18a0dcf9c705f389e135c177c36c362..ced209e0a5d5a0bffcf33403bc8d3e02cbed3e11 100644
--- a/chrome/browser/chromeos/login/screens/hid_detection_screen.h
+++ b/chrome/browser/chromeos/login/screens/hid_detection_screen.h
@@ -7,13 +7,13 @@
#include <stdint.h>
+#include <memory>
#include <string>
#include <vector>
#include "base/callback.h"
#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/device/input_service_proxy.h"
#include "chrome/browser/chromeos/login/screens/base_screen.h"
@@ -133,7 +133,7 @@ class HIDDetectionScreen : public HIDDetectionModel,
// Called by device::BluetoothAdapter in response to a successful request
// to initiate a discovery session.
void OnStartDiscoverySession(
- scoped_ptr<device::BluetoothDiscoverySession> discovery_session);
+ std::unique_ptr<device::BluetoothDiscoverySession> discovery_session);
// Called by device::BluetoothAdapter in response to a failure to
// initiate a discovery session.
@@ -188,7 +188,7 @@ class HIDDetectionScreen : public HIDDetectionModel,
// The current device discovery session. Only one active discovery session is
// kept at a time and the instance that |discovery_session_| points to gets
// replaced by a new one when a new discovery session is initiated.
- scoped_ptr<device::BluetoothDiscoverySession> discovery_session_;
+ std::unique_ptr<device::BluetoothDiscoverySession> discovery_session_;
// Current pointing device, if any. Device name is kept in screen context.
std::string pointing_device_id_;
@@ -202,7 +202,7 @@ class HIDDetectionScreen : public HIDDetectionModel,
std::string keyboard_device_name_;
// State of BT adapter before screen-initiated changes.
- scoped_ptr<bool> adapter_initially_powered_;
+ std::unique_ptr<bool> adapter_initially_powered_;
bool switch_on_adapter_when_ready_;
« no previous file with comments | « chrome/browser/chromeos/login/screens/error_screen.h ('k') | chrome/browser/chromeos/login/screens/hid_detection_screen.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698