extensions/browser/guest_view/mime_handler_view/mime_handler_stream_manager.h - Issue 2294653002: Some linked_ptr -> unique_ptr conversion in extensions/browser.

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/browser/guest_view/mime_handler_view/mime_handler_stream_manager.h

Issue 2294653002: Some linked_ptr -> unique_ptr conversion in extensions/browser. (Closed)

Patch Set: address comments Created 4 years, 4 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/browser/guest_view/app_view/app_view_guest.cc ('k') | extensions/browser/guest_view/mime_handler_view/mime_handler_stream_manager.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: extensions/browser/guest_view/mime_handler_view/mime_handler_stream_manager.h

diff --git a/extensions/browser/guest_view/mime_handler_view/mime_handler_stream_manager.h b/extensions/browser/guest_view/mime_handler_view/mime_handler_stream_manager.h

index 3f9670117c192558f524a193ba0092a94fbcd6b1..880f140b88c952beed6bb2f05ebe5751aea77d8f 100644

--- a/extensions/browser/guest_view/mime_handler_view/mime_handler_stream_manager.h

+++ b/extensions/browser/guest_view/mime_handler_view/mime_handler_stream_manager.h

@@ -9,7 +9,6 @@

#include <set>

#include <string>

-#include "base/memory/linked_ptr.h"

#include "base/memory/ref_counted.h"

#include "base/scoped_observer.h"

#include "components/keyed_service/core/keyed_service.h"

@@ -52,7 +51,7 @@ class MimeHandlerStreamManager : public KeyedService,

// Maps view id->StreamContainer to maintain their lifetime until they are

// used or removed.

- std::map<std::string, linked_ptr<StreamContainer>> streams_;

+ std::map<std::string, std::unique_ptr<StreamContainer>> streams_;

// Maps extension id->view id for removing the associated streams when an

// extension is unloaded.

@@ -60,7 +59,7 @@ class MimeHandlerStreamManager : public KeyedService,

// Maps view id->EmbedderObserver for maintaining the lifetime of the

// EmbedderObserver until it is removed.

- std::map<std::string, linked_ptr<EmbedderObserver>> embedder_observers_;

+ std::map<std::string, std::unique_ptr<EmbedderObserver>> embedder_observers_;

ScopedObserver<ExtensionRegistry, ExtensionRegistryObserver>

extension_registry_observer_;