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

Side by Side 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 unified diff | Download patch
OLDNEW
1 // Copyright 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #ifndef COMPONENTS_PAIRING_SHARK_CONNECTION_LISTENER_H_ 5 #ifndef COMPONENTS_PAIRING_SHARK_CONNECTION_LISTENER_H_
6 #define COMPONENTS_PAIRING_SHARK_CONNECTION_LISTENER_H_ 6 #define COMPONENTS_PAIRING_SHARK_CONNECTION_LISTENER_H_
7 7
8 #include <memory>
8 #include <string> 9 #include <string>
9 10
10 #include "base/callback.h" 11 #include "base/callback.h"
11 #include "base/macros.h" 12 #include "base/macros.h"
12 #include "base/memory/scoped_ptr.h"
13 #include "components/pairing/host_pairing_controller.h" 13 #include "components/pairing/host_pairing_controller.h"
14 14
15 namespace pairing_chromeos { 15 namespace pairing_chromeos {
16 16
17 // Listens for incoming connection from shark controller. If connection 17 // Listens for incoming connection from shark controller. If connection
18 // is established, invokes callback passing HostPairingController 18 // is established, invokes callback passing HostPairingController
19 // as an argument. 19 // as an argument.
20 class SharkConnectionListener : public HostPairingController::Observer { 20 class SharkConnectionListener : public HostPairingController::Observer {
21 public: 21 public:
22 typedef base::Callback<void(scoped_ptr<HostPairingController>)> 22 using OnConnectedCallback =
23 OnConnectedCallback; 23 base::Callback<void(std::unique_ptr<HostPairingController>)>;
24 24
25 explicit SharkConnectionListener(OnConnectedCallback callback); 25 explicit SharkConnectionListener(OnConnectedCallback callback);
26 ~SharkConnectionListener() override; 26 ~SharkConnectionListener() override;
27 27
28 private: 28 private:
29 typedef HostPairingController::Stage Stage; 29 typedef HostPairingController::Stage Stage;
30 30
31 // HostPairingController::Observer overrides: 31 // HostPairingController::Observer overrides:
32 void PairingStageChanged(Stage new_stage) override; 32 void PairingStageChanged(Stage new_stage) override;
33 33
34 OnConnectedCallback callback_; 34 OnConnectedCallback callback_;
35 scoped_ptr<HostPairingController> controller_; 35 std::unique_ptr<HostPairingController> controller_;
36 36
37 DISALLOW_COPY_AND_ASSIGN(SharkConnectionListener); 37 DISALLOW_COPY_AND_ASSIGN(SharkConnectionListener);
38 }; 38 };
39 39
40 } // namespace pairing_chromeos 40 } // namespace pairing_chromeos
41 41
42 #endif // COMPONENTS_PAIRING_SHARK_CONNECTION_LISTENER_H_ 42 #endif // COMPONENTS_PAIRING_SHARK_CONNECTION_LISTENER_H_
OLDNEW
« 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