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

Side by Side Diff: extensions/renderer/api/display_source/wifi_display/wifi_display_session.h

Issue 1899083003: Convert //extensions/renderer 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 unified diff | Download patch
OLDNEW
1 // Copyright 2015 The Chromium Authors. All rights reserved. 1 // Copyright 2015 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 EXTENSIONS_RENDERER_API_DISPLAY_SOURCE_WIFI_DISPLAY_WIFI_DISPLAY_SESSION _H_ 5 #ifndef EXTENSIONS_RENDERER_API_DISPLAY_SOURCE_WIFI_DISPLAY_WIFI_DISPLAY_SESSION _H_
6 #define EXTENSIONS_RENDERER_API_DISPLAY_SOURCE_WIFI_DISPLAY_WIFI_DISPLAY_SESSION _H_ 6 #define EXTENSIONS_RENDERER_API_DISPLAY_SOURCE_WIFI_DISPLAY_WIFI_DISPLAY_SESSION _H_
7 7
8 #include <map> 8 #include <map>
9 #include <string> 9 #include <string>
10 10
(...skipping 55 matching lines...) Expand 10 before | Expand all | Expand 10 after
66 66
67 // An error handler for media pipeline error. 67 // An error handler for media pipeline error.
68 void OnMediaError(const std::string& error); 68 void OnMediaError(const std::string& error);
69 69
70 void Terminate(); 70 void Terminate();
71 71
72 void RunStartCallback(bool success, const std::string& error = ""); 72 void RunStartCallback(bool success, const std::string& error = "");
73 void RunTerminateCallback(bool success, const std::string& error = ""); 73 void RunTerminateCallback(bool success, const std::string& error = "");
74 74
75 private: 75 private:
76 scoped_ptr<wds::Source> wfd_source_; 76 std::unique_ptr<wds::Source> wfd_source_;
77 scoped_ptr<WiFiDisplayMediaManager> media_manager_; 77 std::unique_ptr<WiFiDisplayMediaManager> media_manager_;
78 WiFiDisplaySessionServicePtr service_; 78 WiFiDisplaySessionServicePtr service_;
79 mojo::Binding<WiFiDisplaySessionServiceClient> binding_; 79 mojo::Binding<WiFiDisplaySessionServiceClient> binding_;
80 std::string local_ip_address_; 80 std::string local_ip_address_;
81 std::map<int, scoped_ptr<base::Timer>> timers_; 81 std::map<int, std::unique_ptr<base::Timer>> timers_;
82 82
83 DisplaySourceSessionParams params_; 83 DisplaySourceSessionParams params_;
84 CompletionCallback start_completion_callback_; 84 CompletionCallback start_completion_callback_;
85 CompletionCallback teminate_completion_callback_; 85 CompletionCallback teminate_completion_callback_;
86 // Holds sequence number for the following RTSP request-response pair. 86 // Holds sequence number for the following RTSP request-response pair.
87 mutable int cseq_; 87 mutable int cseq_;
88 int timer_id_; 88 int timer_id_;
89 base::WeakPtrFactory<WiFiDisplaySession> weak_factory_; 89 base::WeakPtrFactory<WiFiDisplaySession> weak_factory_;
90 90
91 DISALLOW_COPY_AND_ASSIGN(WiFiDisplaySession); 91 DISALLOW_COPY_AND_ASSIGN(WiFiDisplaySession);
92 }; 92 };
93 93
94 } // namespace extensions 94 } // namespace extensions
95 95
96 #endif // EXTENSIONS_RENDERER_API_DISPLAY_SOURCE_WIFI_DISPLAY_WIFI_DISPLAY_SESS ION_H_ 96 #endif // EXTENSIONS_RENDERER_API_DISPLAY_SOURCE_WIFI_DISPLAY_WIFI_DISPLAY_SESS ION_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698