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

Unified Diff: components/pairing/shark_connection_listener.h

Issue 1921923002: Convert //components/[o-t]* 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/pairing/proto_decoder.h ('k') | components/plugins/renderer/loadable_plugin_placeholder.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: components/pairing/shark_connection_listener.h
diff --git a/components/pairing/shark_connection_listener.h b/components/pairing/shark_connection_listener.h
index c0b3836b526e267107ff95f73b36522e8ed23bf3..8cc225d3f9024272841779050ec633c51bb3838a 100644
--- a/components/pairing/shark_connection_listener.h
+++ b/components/pairing/shark_connection_listener.h
@@ -5,11 +5,11 @@
#ifndef COMPONENTS_PAIRING_SHARK_CONNECTION_LISTENER_H_
#define COMPONENTS_PAIRING_SHARK_CONNECTION_LISTENER_H_
+#include <memory>
#include <string>
#include "base/callback.h"
#include "base/macros.h"
-#include "base/memory/scoped_ptr.h"
#include "components/pairing/host_pairing_controller.h"
namespace pairing_chromeos {
@@ -19,8 +19,8 @@ namespace pairing_chromeos {
// as an argument.
class SharkConnectionListener : public HostPairingController::Observer {
public:
- typedef base::Callback<void(scoped_ptr<HostPairingController>)>
- OnConnectedCallback;
+ using OnConnectedCallback =
+ base::Callback<void(std::unique_ptr<HostPairingController>)>;
explicit SharkConnectionListener(OnConnectedCallback callback);
~SharkConnectionListener() override;
@@ -32,7 +32,7 @@ class SharkConnectionListener : public HostPairingController::Observer {
void PairingStageChanged(Stage new_stage) override;
OnConnectedCallback callback_;
- scoped_ptr<HostPairingController> controller_;
+ std::unique_ptr<HostPairingController> controller_;
DISALLOW_COPY_AND_ASSIGN(SharkConnectionListener);
};
« no previous file with comments | « components/pairing/proto_decoder.h ('k') | components/plugins/renderer/loadable_plugin_placeholder.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698