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

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

Issue 2294653002: Some linked_ptr -> unique_ptr conversion in extensions/browser. (Closed)
Patch Set: address comments Created 4 years, 3 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/ptr_util.h"
8 #include "base/memory/singleton.h" 8 #include "base/memory/singleton.h"
9 #include "components/keyed_service/content/browser_context_dependency_manager.h" 9 #include "components/keyed_service/content/browser_context_dependency_manager.h"
10 #include "components/keyed_service/content/browser_context_keyed_service_factory .h" 10 #include "components/keyed_service/content/browser_context_keyed_service_factory .h"
(...skipping 98 matching lines...) Expand 10 before | Expand all | Expand 10 after
109 content::BrowserContext* context) { 109 content::BrowserContext* context) {
110 return MimeHandlerStreamManagerFactory::GetInstance()->Get(context); 110 return MimeHandlerStreamManagerFactory::GetInstance()->Get(context);
111 } 111 }
112 112
113 void MimeHandlerStreamManager::AddStream( 113 void MimeHandlerStreamManager::AddStream(
114 const std::string& view_id, 114 const std::string& view_id,
115 std::unique_ptr<StreamContainer> stream, 115 std::unique_ptr<StreamContainer> stream,
116 int render_process_id, 116 int render_process_id,
117 int render_frame_id) { 117 int render_frame_id) {
118 streams_by_extension_id_[stream->extension_id()].insert(view_id); 118 streams_by_extension_id_[stream->extension_id()].insert(view_id);
119 auto result = streams_.insert( 119 auto result = streams_.insert(std::make_pair(view_id, std::move(stream)));
120 std::make_pair(view_id, make_linked_ptr(stream.release())));
121 DCHECK(result.second); 120 DCHECK(result.second);
122 embedder_observers_[view_id] = make_linked_ptr( 121 embedder_observers_[view_id] = base::MakeUnique<EmbedderObserver>(
123 new EmbedderObserver(this, render_process_id, render_frame_id, view_id)); 122 this, render_process_id, render_frame_id, view_id);
124 } 123 }
125 124
126 std::unique_ptr<StreamContainer> MimeHandlerStreamManager::ReleaseStream( 125 std::unique_ptr<StreamContainer> MimeHandlerStreamManager::ReleaseStream(
127 const std::string& view_id) { 126 const std::string& view_id) {
128 auto stream = streams_.find(view_id); 127 auto stream = streams_.find(view_id);
129 if (stream == streams_.end()) 128 if (stream == streams_.end())
130 return nullptr; 129 return nullptr;
131 130
132 std::unique_ptr<StreamContainer> result = 131 std::unique_ptr<StreamContainer> result =
133 base::WrapUnique(stream->second.release()); 132 base::WrapUnique(stream->second.release());
(...skipping 65 matching lines...) Expand 10 before | Expand all | Expand 10 after
199 stream_manager_->ReleaseStream(view_id_); 198 stream_manager_->ReleaseStream(view_id_);
200 } 199 }
201 200
202 bool MimeHandlerStreamManager::EmbedderObserver::IsTrackedRenderFrameHost( 201 bool MimeHandlerStreamManager::EmbedderObserver::IsTrackedRenderFrameHost(
203 content::RenderFrameHost* render_frame_host) { 202 content::RenderFrameHost* render_frame_host) {
204 return render_frame_host->GetRoutingID() == render_frame_id_ && 203 return render_frame_host->GetRoutingID() == render_frame_id_ &&
205 render_frame_host->GetProcess()->GetID() == render_process_id_; 204 render_frame_host->GetProcess()->GetID() == render_process_id_;
206 } 205 }
207 206
208 } // namespace extensions 207 } // namespace extensions
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698