extensions/renderer/api/display_source/wifi_display/wifi_display_session.h - Issue 1899083003: Convert //extensions/renderer from scoped_ptr to std::unique_ptr

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified 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 side-by-side diff with in-line comments

Download patch

« no previous file with comments | « extensions/renderer/api/display_source/wifi_display/wifi_display_elementary_stream_descriptor.h ('k') | extensions/renderer/api/display_source/wifi_display/wifi_display_session.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: extensions/renderer/api/display_source/wifi_display/wifi_display_session.h

diff --git a/extensions/renderer/api/display_source/wifi_display/wifi_display_session.h b/extensions/renderer/api/display_source/wifi_display/wifi_display_session.h

index ce9e5a41c2a35dcec9a9257147064ca661bb6d6d..d3da802a2a9e3435f711a44618a247f4ec30421f 100644

--- a/extensions/renderer/api/display_source/wifi_display/wifi_display_session.h

+++ b/extensions/renderer/api/display_source/wifi_display/wifi_display_session.h

@@ -73,12 +73,12 @@ class WiFiDisplaySession: public DisplaySourceSession,

void RunTerminateCallback(bool success, const std::string& error = "");

private:

- scoped_ptr<wds::Source> wfd_source_;

- scoped_ptr<WiFiDisplayMediaManager> media_manager_;

+ std::unique_ptr<wds::Source> wfd_source_;

+ std::unique_ptr<WiFiDisplayMediaManager> media_manager_;

WiFiDisplaySessionServicePtr service_;

mojo::Binding<WiFiDisplaySessionServiceClient> binding_;

std::string local_ip_address_;

- std::map<int, scoped_ptr<base::Timer>> timers_;

+ std::map<int, std::unique_ptr<base::Timer>> timers_;

DisplaySourceSessionParams params_;

CompletionCallback start_completion_callback_;