| OLD | NEW |
| 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_chooser_controller.h" | 5 #include "chrome/browser/usb/usb_chooser_controller.h" |
| 6 | 6 |
| 7 #include <stddef.h> | 7 #include <stddef.h> |
| 8 #include <utility> | 8 #include <utility> |
| 9 | 9 |
| 10 #include "base/bind.h" | 10 #include "base/bind.h" |
| 11 #include "base/command_line.h" | 11 #include "base/command_line.h" |
| 12 #include "chrome/browser/net/referrer.h" | 12 #include "chrome/browser/net/referrer.h" |
| 13 #include "chrome/browser/profiles/profile.h" | 13 #include "chrome/browser/profiles/profile.h" |
| 14 #include "chrome/browser/profiles/profile_manager.h" | 14 #include "chrome/browser/profiles/profile_manager.h" |
| 15 #include "chrome/browser/ui/browser.h" | 15 #include "chrome/browser/ui/browser.h" |
| 16 #include "chrome/browser/ui/scoped_tabbed_browser_displayer.h" | 16 #include "chrome/browser/ui/scoped_tabbed_browser_displayer.h" |
| 17 #include "chrome/browser/usb/usb_chooser_context.h" | 17 #include "chrome/browser/usb/usb_chooser_context.h" |
| 18 #include "chrome/browser/usb/usb_chooser_context_factory.h" | 18 #include "chrome/browser/usb/usb_chooser_context_factory.h" |
| 19 #include "chrome/browser/usb/web_usb_histograms.h" | 19 #include "chrome/browser/usb/web_usb_histograms.h" |
| 20 #include "chrome/browser/usb/web_usb_permission_provider.h" |
| 20 #include "chrome/common/chrome_switches.h" | 21 #include "chrome/common/chrome_switches.h" |
| 21 #include "chrome/common/url_constants.h" | 22 #include "chrome/common/url_constants.h" |
| 22 #include "chrome/grit/generated_resources.h" | 23 #include "chrome/grit/generated_resources.h" |
| 23 #include "content/public/browser/render_frame_host.h" | 24 #include "content/public/browser/render_frame_host.h" |
| 24 #include "content/public/browser/web_contents.h" | 25 #include "content/public/browser/web_contents.h" |
| 25 #include "device/core/device_client.h" | 26 #include "device/core/device_client.h" |
| 26 #include "device/usb/mojo/type_converters.h" | 27 #include "device/usb/mojo/type_converters.h" |
| 27 #include "device/usb/usb_device.h" | 28 #include "device/usb/usb_device.h" |
| 28 #include "device/usb/usb_device_filter.h" | 29 #include "device/usb/usb_device_filter.h" |
| 29 #include "device/usb/webusb_descriptors.h" | 30 #include "device/usb/webusb_descriptors.h" |
| (...skipping 60 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 90 const base::string16& device_name = devices_[index].second; | 91 const base::string16& device_name = devices_[index].second; |
| 91 const auto& it = device_name_map_.find(device_name); | 92 const auto& it = device_name_map_.find(device_name); |
| 92 DCHECK(it != device_name_map_.end()); | 93 DCHECK(it != device_name_map_.end()); |
| 93 return it->second == 1 | 94 return it->second == 1 |
| 94 ? device_name | 95 ? device_name |
| 95 : l10n_util::GetStringFUTF16( | 96 : l10n_util::GetStringFUTF16( |
| 96 IDS_DEVICE_CHOOSER_DEVICE_NAME_WITH_ID, device_name, | 97 IDS_DEVICE_CHOOSER_DEVICE_NAME_WITH_ID, device_name, |
| 97 devices_[index].first->serial_number()); | 98 devices_[index].first->serial_number()); |
| 98 } | 99 } |
| 99 | 100 |
| 101 bool UsbChooserController::IsPaired(size_t index) const { |
| 102 return WebUSBPermissionProvider::HasDevicePermission(render_frame_host_, |
| 103 devices_[index].first); |
| 104 } |
| 105 |
| 100 void UsbChooserController::RefreshOptions() {} | 106 void UsbChooserController::RefreshOptions() {} |
| 101 | 107 |
| 102 base::string16 UsbChooserController::GetStatus() const { | 108 base::string16 UsbChooserController::GetStatus() const { |
| 103 return base::string16(); | 109 return base::string16(); |
| 104 } | 110 } |
| 105 | 111 |
| 106 void UsbChooserController::Select(size_t index) { | 112 void UsbChooserController::Select(size_t index) { |
| 107 DCHECK_LT(index, devices_.size()); | 113 DCHECK_LT(index, devices_.size()); |
| 108 content::WebContents* web_contents = | 114 content::WebContents* web_contents = |
| 109 content::WebContents::FromRenderFrameHost(render_frame_host_); | 115 content::WebContents::FromRenderFrameHost(render_frame_host_); |
| (...skipping 77 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 187 | 193 |
| 188 bool UsbChooserController::DisplayDevice( | 194 bool UsbChooserController::DisplayDevice( |
| 189 scoped_refptr<device::UsbDevice> device) const { | 195 scoped_refptr<device::UsbDevice> device) const { |
| 190 return device::UsbDeviceFilter::MatchesAny(device, filters_) && | 196 return device::UsbDeviceFilter::MatchesAny(device, filters_) && |
| 191 (base::CommandLine::ForCurrentProcess()->HasSwitch( | 197 (base::CommandLine::ForCurrentProcess()->HasSwitch( |
| 192 switches::kDisableWebUsbSecurity) || | 198 switches::kDisableWebUsbSecurity) || |
| 193 device::FindInWebUsbAllowedOrigins( | 199 device::FindInWebUsbAllowedOrigins( |
| 194 device->webusb_allowed_origins(), | 200 device->webusb_allowed_origins(), |
| 195 render_frame_host_->GetLastCommittedURL().GetOrigin())); | 201 render_frame_host_->GetLastCommittedURL().GetOrigin())); |
| 196 } | 202 } |
| OLD | NEW |