chrome/browser/ui/webui/media_router/query_result_manager.cc - Issue 1494833002: Cleanup/ linked_ptr -> scoped_ptr from c/b/ui/webui

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: chrome/browser/ui/webui/media_router/query_result_manager.cc

Issue 1494833002: Cleanup/ linked_ptr -> scoped_ptr from c/b/ui/webui (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Created 5 years 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 | « chrome/browser/ui/webui/media_router/query_result_manager.h ('k') | chrome/browser/ui/webui/print_preview/print_preview_handler.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/ui/webui/media_router/query_result_manager.cc

diff --git a/chrome/browser/ui/webui/media_router/query_result_manager.cc b/chrome/browser/ui/webui/media_router/query_result_manager.cc

index 43547bb2496f10e4e7cddfe2fdbf69801ccb3260..e451fdb3e4971b53f3d2d077d768c3c28eb8a1c4 100644

--- a/chrome/browser/ui/webui/media_router/query_result_manager.cc

+++ b/chrome/browser/ui/webui/media_router/query_result_manager.cc

@@ -85,10 +85,11 @@ void QueryResultManager::StartSinksQuery(MediaCastMode cast_mode,

RemoveObserverForCastMode(cast_mode);

UpdateWithSinksQueryResult(cast_mode, std::vector<MediaSink>());

- linked_ptr<CastModeMediaSinksObserver> observer(

+ scoped_ptr<CastModeMediaSinksObserver> observer(

new CastModeMediaSinksObserver(cast_mode, source, router_, this));

observer->Init();

- auto result = sinks_observers_.insert(std::make_pair(cast_mode, observer));

+ auto result =

+ sinks_observers_.insert(std::make_pair(cast_mode, std::move(observer)));

DCHECK(result.second);

NotifyOnResultsUpdated();

}