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

Unified Diff: components/arc/bluetooth/arc_bluetooth_bridge.h

Issue 1921973002: Convert //components/[a-e]* from scoped_ptr to std::unique_ptr (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: . 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 | « components/arc/arc_service_manager.cc ('k') | components/arc/bluetooth/arc_bluetooth_bridge.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: components/arc/bluetooth/arc_bluetooth_bridge.h
diff --git a/components/arc/bluetooth/arc_bluetooth_bridge.h b/components/arc/bluetooth/arc_bluetooth_bridge.h
index 9b5890e84f5b70127a0fd8f9ba6797fe382a435c..f6843005123a85680d3ae5d3ab015cc477a09b39 100644
--- a/components/arc/bluetooth/arc_bluetooth_bridge.h
+++ b/components/arc/bluetooth/arc_bluetooth_bridge.h
@@ -7,6 +7,7 @@
#include <stdint.h>
+#include <memory>
#include <string>
#include <vector>
@@ -143,7 +144,7 @@ class ArcBluetoothBridge
void OnPoweredError(
const mojo::Callback<void(mojom::BluetoothAdapterState)>& callback) const;
void OnDiscoveryStarted(
- scoped_ptr<device::BluetoothDiscoverySession> session);
+ std::unique_ptr<device::BluetoothDiscoverySession> session);
void OnDiscoveryStopped();
void OnDiscoveryError();
void OnPairing(mojom::BluetoothAddressPtr addr) const;
@@ -170,7 +171,7 @@ class ArcBluetoothBridge
mojo::Binding<mojom::BluetoothHost> binding_;
scoped_refptr<device::BluetoothAdapter> bluetooth_adapter_;
- scoped_ptr<device::BluetoothDiscoverySession> discovery_session_;
+ std::unique_ptr<device::BluetoothDiscoverySession> discovery_session_;
// WeakPtrFactory to use for callbacks.
base::WeakPtrFactory<ArcBluetoothBridge> weak_factory_;
« no previous file with comments | « components/arc/arc_service_manager.cc ('k') | components/arc/bluetooth/arc_bluetooth_bridge.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698