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

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

Issue 2821723002: Move classes in the device.usb Mojo namespace to device.mojom (Closed)
Patch Set: mcasas@ nits Created 3 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
« no previous file with comments | « chrome/browser/usb/usb_tab_helper.h ('k') | chrome/browser/usb/web_usb_chooser_service.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 <memory> 7 #include <memory>
8 #include <utility> 8 #include <utility>
9 9
10 #include "chrome/browser/ui/browser_finder.h" 10 #include "chrome/browser/ui/browser_finder.h"
(...skipping 30 matching lines...) Expand all
41 CreateForWebContents(web_contents); 41 CreateForWebContents(web_contents);
42 tab_helper = FromWebContents(web_contents); 42 tab_helper = FromWebContents(web_contents);
43 } 43 }
44 return tab_helper; 44 return tab_helper;
45 } 45 }
46 46
47 UsbTabHelper::~UsbTabHelper() {} 47 UsbTabHelper::~UsbTabHelper() {}
48 48
49 void UsbTabHelper::CreateDeviceManager( 49 void UsbTabHelper::CreateDeviceManager(
50 RenderFrameHost* render_frame_host, 50 RenderFrameHost* render_frame_host,
51 mojo::InterfaceRequest<device::usb::DeviceManager> request) { 51 mojo::InterfaceRequest<device::mojom::UsbDeviceManager> request) {
52 DCHECK(WebContents::FromRenderFrameHost(render_frame_host) == web_contents()); 52 DCHECK(WebContents::FromRenderFrameHost(render_frame_host) == web_contents());
53 device::usb::DeviceManagerImpl::Create( 53 device::usb::DeviceManagerImpl::Create(
54 GetPermissionProvider(render_frame_host), std::move(request)); 54 GetPermissionProvider(render_frame_host), std::move(request));
55 } 55 }
56 56
57 void UsbTabHelper::CreateChooserService( 57 void UsbTabHelper::CreateChooserService(
58 content::RenderFrameHost* render_frame_host, 58 content::RenderFrameHost* render_frame_host,
59 mojo::InterfaceRequest<device::usb::ChooserService> request) { 59 mojo::InterfaceRequest<device::mojom::UsbChooserService> request) {
60 GetChooserService(render_frame_host, std::move(request)); 60 GetChooserService(render_frame_host, std::move(request));
61 } 61 }
62 62
63 void UsbTabHelper::IncrementConnectionCount( 63 void UsbTabHelper::IncrementConnectionCount(
64 RenderFrameHost* render_frame_host) { 64 RenderFrameHost* render_frame_host) {
65 auto it = frame_usb_services_.find(render_frame_host); 65 auto it = frame_usb_services_.find(render_frame_host);
66 DCHECK(it != frame_usb_services_.end()); 66 DCHECK(it != frame_usb_services_.end());
67 it->second->device_connection_count_++; 67 it->second->device_connection_count_++;
68 NotifyTabStateChanged(); 68 NotifyTabStateChanged();
69 } 69 }
(...skipping 42 matching lines...) Expand 10 before | Expand all | Expand 10 after
112 FrameUsbServices* frame_usb_services = GetFrameUsbService(render_frame_host); 112 FrameUsbServices* frame_usb_services = GetFrameUsbService(render_frame_host);
113 if (!frame_usb_services->permission_provider) { 113 if (!frame_usb_services->permission_provider) {
114 frame_usb_services->permission_provider.reset( 114 frame_usb_services->permission_provider.reset(
115 new WebUSBPermissionProvider(render_frame_host)); 115 new WebUSBPermissionProvider(render_frame_host));
116 } 116 }
117 return frame_usb_services->permission_provider->GetWeakPtr(); 117 return frame_usb_services->permission_provider->GetWeakPtr();
118 } 118 }
119 119
120 void UsbTabHelper::GetChooserService( 120 void UsbTabHelper::GetChooserService(
121 content::RenderFrameHost* render_frame_host, 121 content::RenderFrameHost* render_frame_host,
122 mojo::InterfaceRequest<device::usb::ChooserService> request) { 122 mojo::InterfaceRequest<device::mojom::UsbChooserService> request) {
123 FrameUsbServices* frame_usb_services = GetFrameUsbService(render_frame_host); 123 FrameUsbServices* frame_usb_services = GetFrameUsbService(render_frame_host);
124 if (!frame_usb_services->chooser_service) { 124 if (!frame_usb_services->chooser_service) {
125 frame_usb_services->chooser_service.reset( 125 frame_usb_services->chooser_service.reset(
126 #if defined(OS_ANDROID) 126 #if defined(OS_ANDROID)
127 new WebUsbChooserServiceAndroid(render_frame_host)); 127 new WebUsbChooserServiceAndroid(render_frame_host));
128 #else 128 #else
129 new WebUsbChooserService(render_frame_host)); 129 new WebUsbChooserService(render_frame_host));
130 #endif // defined(OS_ANDROID) 130 #endif // defined(OS_ANDROID)
131 } 131 }
132 frame_usb_services->chooser_service->Bind(std::move(request)); 132 frame_usb_services->chooser_service->Bind(std::move(request));
133 } 133 }
134 134
135 void UsbTabHelper::NotifyTabStateChanged() const { 135 void UsbTabHelper::NotifyTabStateChanged() const {
136 // TODO(https://crbug.com/601627): Implement tab indicator for Android. 136 // TODO(https://crbug.com/601627): Implement tab indicator for Android.
137 #if !defined(OS_ANDROID) 137 #if !defined(OS_ANDROID)
138 Browser* browser = chrome::FindBrowserWithWebContents(web_contents()); 138 Browser* browser = chrome::FindBrowserWithWebContents(web_contents());
139 if (browser) { 139 if (browser) {
140 TabStripModel* tab_strip_model = browser->tab_strip_model(); 140 TabStripModel* tab_strip_model = browser->tab_strip_model();
141 tab_strip_model->UpdateWebContentsStateAt( 141 tab_strip_model->UpdateWebContentsStateAt(
142 tab_strip_model->GetIndexOfWebContents(web_contents()), 142 tab_strip_model->GetIndexOfWebContents(web_contents()),
143 TabStripModelObserver::ALL); 143 TabStripModelObserver::ALL);
144 } 144 }
145 #endif 145 #endif
146 } 146 }
OLDNEW
« no previous file with comments | « chrome/browser/usb/usb_tab_helper.h ('k') | chrome/browser/usb/web_usb_chooser_service.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698