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

Side by Side Diff: chrome/browser/usb/usb_tab_helper.cc

Issue 1551503002: Convert Pass()→std::move() in //chrome (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 12 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 "chrome/browser/usb/usb_tab_helper.h" 5 #include "chrome/browser/usb/usb_tab_helper.h"
6 6
7 #include <utility> 7 #include <utility>
8 8
9 #include "base/memory/scoped_ptr.h" 9 #include "base/memory/scoped_ptr.h"
10 #include "chrome/browser/usb/web_usb_permission_bubble.h" 10 #include "chrome/browser/usb/web_usb_permission_bubble.h"
(...skipping 23 matching lines...) Expand all
34 34
35 UsbTabHelper::~UsbTabHelper() {} 35 UsbTabHelper::~UsbTabHelper() {}
36 36
37 void UsbTabHelper::CreateDeviceManager( 37 void UsbTabHelper::CreateDeviceManager(
38 RenderFrameHost* render_frame_host, 38 RenderFrameHost* render_frame_host,
39 mojo::InterfaceRequest<device::usb::DeviceManager> request) { 39 mojo::InterfaceRequest<device::usb::DeviceManager> request) {
40 DCHECK(WebContents::FromRenderFrameHost(render_frame_host) == web_contents()); 40 DCHECK(WebContents::FromRenderFrameHost(render_frame_host) == web_contents());
41 device::usb::PermissionProviderPtr permission_provider; 41 device::usb::PermissionProviderPtr permission_provider;
42 GetPermissionProvider(render_frame_host, 42 GetPermissionProvider(render_frame_host,
43 mojo::GetProxy(&permission_provider)); 43 mojo::GetProxy(&permission_provider));
44 device::usb::DeviceManagerImpl::Create(permission_provider.Pass(), 44 device::usb::DeviceManagerImpl::Create(std::move(permission_provider),
45 request.Pass()); 45 std::move(request));
46 } 46 }
47 47
48 void UsbTabHelper::CreatePermissionBubble( 48 void UsbTabHelper::CreatePermissionBubble(
49 content::RenderFrameHost* render_frame_host, 49 content::RenderFrameHost* render_frame_host,
50 mojo::InterfaceRequest<webusb::WebUsbPermissionBubble> request) { 50 mojo::InterfaceRequest<webusb::WebUsbPermissionBubble> request) {
51 GetPermissionBubble(render_frame_host, request.Pass()); 51 GetPermissionBubble(render_frame_host, std::move(request));
52 } 52 }
53 53
54 UsbTabHelper::UsbTabHelper(WebContents* web_contents) 54 UsbTabHelper::UsbTabHelper(WebContents* web_contents)
55 : content::WebContentsObserver(web_contents) {} 55 : content::WebContentsObserver(web_contents) {}
56 56
57 void UsbTabHelper::RenderFrameDeleted(RenderFrameHost* render_frame_host) { 57 void UsbTabHelper::RenderFrameDeleted(RenderFrameHost* render_frame_host) {
58 frame_usb_services_.erase(render_frame_host); 58 frame_usb_services_.erase(render_frame_host);
59 } 59 }
60 60
61 FrameUsbServices* UsbTabHelper::GetFrameUsbService( 61 FrameUsbServices* UsbTabHelper::GetFrameUsbService(
62 content::RenderFrameHost* render_frame_host) { 62 content::RenderFrameHost* render_frame_host) {
63 FrameUsbServicesMap::const_iterator it = 63 FrameUsbServicesMap::const_iterator it =
64 frame_usb_services_.find(render_frame_host); 64 frame_usb_services_.find(render_frame_host);
65 if (it == frame_usb_services_.end()) { 65 if (it == frame_usb_services_.end()) {
66 scoped_ptr<FrameUsbServices> frame_usb_services(new FrameUsbServices()); 66 scoped_ptr<FrameUsbServices> frame_usb_services(new FrameUsbServices());
67 it = (frame_usb_services_.insert( 67 it = (frame_usb_services_.insert(
68 std::make_pair(render_frame_host, frame_usb_services.Pass()))) 68 std::make_pair(render_frame_host, std::move(frame_usb_services))))
69 .first; 69 .first;
70 } 70 }
71 return it->second.get(); 71 return it->second.get();
72 } 72 }
73 73
74 void UsbTabHelper::GetPermissionProvider( 74 void UsbTabHelper::GetPermissionProvider(
75 RenderFrameHost* render_frame_host, 75 RenderFrameHost* render_frame_host,
76 mojo::InterfaceRequest<device::usb::PermissionProvider> request) { 76 mojo::InterfaceRequest<device::usb::PermissionProvider> request) {
77 FrameUsbServices* frame_usb_services = GetFrameUsbService(render_frame_host); 77 FrameUsbServices* frame_usb_services = GetFrameUsbService(render_frame_host);
78 if (!frame_usb_services->permission_provider) { 78 if (!frame_usb_services->permission_provider) {
79 frame_usb_services->permission_provider.reset( 79 frame_usb_services->permission_provider.reset(
80 new WebUSBPermissionProvider(render_frame_host)); 80 new WebUSBPermissionProvider(render_frame_host));
81 } 81 }
82 frame_usb_services->permission_provider->Bind(request.Pass()); 82 frame_usb_services->permission_provider->Bind(std::move(request));
83 } 83 }
84 84
85 void UsbTabHelper::GetPermissionBubble( 85 void UsbTabHelper::GetPermissionBubble(
86 content::RenderFrameHost* render_frame_host, 86 content::RenderFrameHost* render_frame_host,
87 mojo::InterfaceRequest<webusb::WebUsbPermissionBubble> request) { 87 mojo::InterfaceRequest<webusb::WebUsbPermissionBubble> request) {
88 FrameUsbServices* frame_usb_services = GetFrameUsbService(render_frame_host); 88 FrameUsbServices* frame_usb_services = GetFrameUsbService(render_frame_host);
89 if (!frame_usb_services->permission_bubble) { 89 if (!frame_usb_services->permission_bubble) {
90 frame_usb_services->permission_bubble.reset( 90 frame_usb_services->permission_bubble.reset(
91 new ChromeWebUsbPermissionBubble(render_frame_host)); 91 new ChromeWebUsbPermissionBubble(render_frame_host));
92 } 92 }
93 frame_usb_services->permission_bubble->Bind(request.Pass()); 93 frame_usb_services->permission_bubble->Bind(std::move(request));
94 } 94 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698