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

Side by Side Diff: content/browser/renderer_host/pepper/content_browser_pepper_host_factory.cc

Issue 501033003: Remove implicit conversions from scoped_refptr to T* in content/browser/renderer_host/ (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 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 unified diff | Download patch
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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 "content/browser/renderer_host/pepper/content_browser_pepper_host_facto ry.h" 5 #include "content/browser/renderer_host/pepper/content_browser_pepper_host_facto ry.h"
6 6
7 #include "content/browser/renderer_host/pepper/browser_ppapi_host_impl.h" 7 #include "content/browser/renderer_host/pepper/browser_ppapi_host_impl.h"
8 #include "content/browser/renderer_host/pepper/pepper_browser_font_singleton_hos t.h" 8 #include "content/browser/renderer_host/pepper/pepper_browser_font_singleton_hos t.h"
9 #include "content/browser/renderer_host/pepper/pepper_file_io_host.h" 9 #include "content/browser/renderer_host/pepper/pepper_file_io_host.h"
10 #include "content/browser/renderer_host/pepper/pepper_file_ref_host.h" 10 #include "content/browser/renderer_host/pepper/pepper_file_ref_host.h"
(...skipping 240 matching lines...) Expand 10 before | Expand all | Expand 10 after
251 scoped_ptr<ppapi::host::ResourceHost> 251 scoped_ptr<ppapi::host::ResourceHost>
252 ContentBrowserPepperHostFactory::CreateNewTCPSocket( 252 ContentBrowserPepperHostFactory::CreateNewTCPSocket(
253 PP_Instance instance, 253 PP_Instance instance,
254 PP_Resource resource, 254 PP_Resource resource,
255 ppapi::TCPSocketVersion version) { 255 ppapi::TCPSocketVersion version) {
256 if (!CanCreateSocket()) 256 if (!CanCreateSocket())
257 return scoped_ptr<ResourceHost>(); 257 return scoped_ptr<ResourceHost>();
258 258
259 scoped_refptr<ResourceMessageFilter> tcp_socket( 259 scoped_refptr<ResourceMessageFilter> tcp_socket(
260 new PepperTCPSocketMessageFilter(this, host_, instance, version)); 260 new PepperTCPSocketMessageFilter(this, host_, instance, version));
261 if (!tcp_socket) 261 if (!tcp_socket.get())
262 return scoped_ptr<ResourceHost>(); 262 return scoped_ptr<ResourceHost>();
263 263
264 return scoped_ptr<ResourceHost>(new MessageFilterHost( 264 return scoped_ptr<ResourceHost>(new MessageFilterHost(
265 host_->GetPpapiHost(), instance, resource, tcp_socket)); 265 host_->GetPpapiHost(), instance, resource, tcp_socket));
266 } 266 }
267 267
268 const ppapi::PpapiPermissions& ContentBrowserPepperHostFactory::GetPermissions() 268 const ppapi::PpapiPermissions& ContentBrowserPepperHostFactory::GetPermissions()
269 const { 269 const {
270 return host_->GetPpapiHost()->permissions(); 270 return host_->GetPpapiHost()->permissions();
271 } 271 }
272 272
273 } // namespace content 273 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698