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

Side by Side Diff: extensions/browser/guest_view/mime_handler_view/mime_handler_stream_manager.cc

Issue 1909773002: Convert //extensions/browser 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 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 #include "extensions/browser/guest_view/mime_handler_view/mime_handler_stream_ma nager.h" 5 #include "extensions/browser/guest_view/mime_handler_view/mime_handler_stream_ma nager.h"
6 6
7 #include "base/memory/ptr_util.h"
7 #include "base/memory/singleton.h" 8 #include "base/memory/singleton.h"
8 #include "components/keyed_service/content/browser_context_dependency_manager.h" 9 #include "components/keyed_service/content/browser_context_dependency_manager.h"
9 #include "components/keyed_service/content/browser_context_keyed_service_factory .h" 10 #include "components/keyed_service/content/browser_context_keyed_service_factory .h"
10 #include "content/public/browser/render_frame_host.h" 11 #include "content/public/browser/render_frame_host.h"
11 #include "content/public/browser/render_process_host.h" 12 #include "content/public/browser/render_process_host.h"
12 #include "extensions/browser/extension_registry.h" 13 #include "extensions/browser/extension_registry.h"
13 #include "extensions/browser/extensions_browser_client.h" 14 #include "extensions/browser/extensions_browser_client.h"
14 #include "extensions/browser/guest_view/mime_handler_view/mime_handler_view_gues t.h" 15 #include "extensions/browser/guest_view/mime_handler_view/mime_handler_view_gues t.h"
15 16
16 namespace extensions { 17 namespace extensions {
(...skipping 85 matching lines...) Expand 10 before | Expand all | Expand 10 after
102 103
103 MimeHandlerStreamManager::~MimeHandlerStreamManager() { 104 MimeHandlerStreamManager::~MimeHandlerStreamManager() {
104 } 105 }
105 106
106 // static 107 // static
107 MimeHandlerStreamManager* MimeHandlerStreamManager::Get( 108 MimeHandlerStreamManager* MimeHandlerStreamManager::Get(
108 content::BrowserContext* context) { 109 content::BrowserContext* context) {
109 return MimeHandlerStreamManagerFactory::GetInstance()->Get(context); 110 return MimeHandlerStreamManagerFactory::GetInstance()->Get(context);
110 } 111 }
111 112
112 void MimeHandlerStreamManager::AddStream(const std::string& view_id, 113 void MimeHandlerStreamManager::AddStream(
113 scoped_ptr<StreamContainer> stream, 114 const std::string& view_id,
114 int render_process_id, 115 std::unique_ptr<StreamContainer> stream,
115 int render_frame_id) { 116 int render_process_id,
117 int render_frame_id) {
116 streams_by_extension_id_[stream->extension_id()].insert(view_id); 118 streams_by_extension_id_[stream->extension_id()].insert(view_id);
117 auto result = streams_.insert( 119 auto result = streams_.insert(
118 std::make_pair(view_id, make_linked_ptr(stream.release()))); 120 std::make_pair(view_id, make_linked_ptr(stream.release())));
119 DCHECK(result.second); 121 DCHECK(result.second);
120 embedder_observers_[view_id] = make_linked_ptr( 122 embedder_observers_[view_id] = make_linked_ptr(
121 new EmbedderObserver(this, render_process_id, render_frame_id, view_id)); 123 new EmbedderObserver(this, render_process_id, render_frame_id, view_id));
122 } 124 }
123 125
124 scoped_ptr<StreamContainer> MimeHandlerStreamManager::ReleaseStream( 126 std::unique_ptr<StreamContainer> MimeHandlerStreamManager::ReleaseStream(
125 const std::string& view_id) { 127 const std::string& view_id) {
126 auto stream = streams_.find(view_id); 128 auto stream = streams_.find(view_id);
127 if (stream == streams_.end()) 129 if (stream == streams_.end())
128 return nullptr; 130 return nullptr;
129 131
130 scoped_ptr<StreamContainer> result = 132 std::unique_ptr<StreamContainer> result =
131 make_scoped_ptr(stream->second.release()); 133 base::WrapUnique(stream->second.release());
132 streams_by_extension_id_[result->extension_id()].erase(view_id); 134 streams_by_extension_id_[result->extension_id()].erase(view_id);
133 streams_.erase(stream); 135 streams_.erase(stream);
134 embedder_observers_.erase(view_id); 136 embedder_observers_.erase(view_id);
135 return result; 137 return result;
136 } 138 }
137 139
138 void MimeHandlerStreamManager::OnExtensionUnloaded( 140 void MimeHandlerStreamManager::OnExtensionUnloaded(
139 content::BrowserContext* browser_context, 141 content::BrowserContext* browser_context,
140 const Extension* extension, 142 const Extension* extension,
141 UnloadedExtensionInfo::Reason reason) { 143 UnloadedExtensionInfo::Reason reason) {
(...skipping 55 matching lines...) Expand 10 before | Expand all | Expand 10 after
197 stream_manager_->ReleaseStream(view_id_); 199 stream_manager_->ReleaseStream(view_id_);
198 } 200 }
199 201
200 bool MimeHandlerStreamManager::EmbedderObserver::IsTrackedRenderFrameHost( 202 bool MimeHandlerStreamManager::EmbedderObserver::IsTrackedRenderFrameHost(
201 content::RenderFrameHost* render_frame_host) { 203 content::RenderFrameHost* render_frame_host) {
202 return render_frame_host->GetRoutingID() == render_frame_id_ && 204 return render_frame_host->GetRoutingID() == render_frame_id_ &&
203 render_frame_host->GetProcess()->GetID() == render_process_id_; 205 render_frame_host->GetProcess()->GetID() == render_process_id_;
204 } 206 }
205 207
206 } // namespace extensions 208 } // namespace extensions
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698