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

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

Issue 1842643004: Add --disable-webusb-security flag for testing existing devices. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Renamed and refactored FindInWebUsbAllowedOrigins. Created 4 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
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_chooser_bubble_controller.h" 5 #include "chrome/browser/usb/usb_chooser_bubble_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 "chrome/browser/profiles/profile.h" 12 #include "chrome/browser/profiles/profile.h"
12 #include "chrome/browser/usb/usb_chooser_context.h" 13 #include "chrome/browser/usb/usb_chooser_context.h"
13 #include "chrome/browser/usb/usb_chooser_context_factory.h" 14 #include "chrome/browser/usb/usb_chooser_context_factory.h"
14 #include "chrome/browser/usb/web_usb_histograms.h" 15 #include "chrome/browser/usb/web_usb_histograms.h"
16 #include "chrome/common/chrome_switches.h"
15 #include "chrome/common/url_constants.h" 17 #include "chrome/common/url_constants.h"
16 #include "components/bubble/bubble_controller.h" 18 #include "components/bubble/bubble_controller.h"
17 #include "content/public/browser/render_frame_host.h" 19 #include "content/public/browser/render_frame_host.h"
18 #include "content/public/browser/web_contents.h" 20 #include "content/public/browser/web_contents.h"
19 #include "device/core/device_client.h" 21 #include "device/core/device_client.h"
20 #include "device/usb/mojo/type_converters.h" 22 #include "device/usb/mojo/type_converters.h"
21 #include "device/usb/usb_device.h" 23 #include "device/usb/usb_device.h"
22 #include "device/usb/usb_device_filter.h" 24 #include "device/usb/usb_device_filter.h"
23 #include "device/usb/webusb_descriptors.h" 25 #include "device/usb/webusb_descriptors.h"
24 #include "url/gurl.h" 26 #include "url/gurl.h"
(...skipping 73 matching lines...) Expand 10 before | Expand all | Expand 10 after
98 : WEBUSB_CHOOSER_CLOSED_CANCELLED); 100 : WEBUSB_CHOOSER_CLOSED_CANCELLED);
99 101
100 if (bubble_reference_) 102 if (bubble_reference_)
101 bubble_reference_->CloseBubble(BUBBLE_CLOSE_CANCELED); 103 bubble_reference_->CloseBubble(BUBBLE_CLOSE_CANCELED);
102 } 104 }
103 105
104 void UsbChooserBubbleController::Close() {} 106 void UsbChooserBubbleController::Close() {}
105 107
106 void UsbChooserBubbleController::OnDeviceAdded( 108 void UsbChooserBubbleController::OnDeviceAdded(
107 scoped_refptr<device::UsbDevice> device) { 109 scoped_refptr<device::UsbDevice> device) {
108 if (device::UsbDeviceFilter::MatchesAny(device, filters_) && 110 if (DisplayDevice(device)) {
109 FindInWebUsbAllowedOrigins(
110 device->webusb_allowed_origins(),
111 render_frame_host_->GetLastCommittedURL().GetOrigin())) {
112 devices_.push_back(std::make_pair(device, device->product_string())); 111 devices_.push_back(std::make_pair(device, device->product_string()));
113 if (observer()) 112 if (observer())
114 observer()->OnOptionAdded(devices_.size() - 1); 113 observer()->OnOptionAdded(devices_.size() - 1);
115 } 114 }
116 } 115 }
117 116
118 GURL UsbChooserBubbleController::GetHelpCenterUrl() const { 117 GURL UsbChooserBubbleController::GetHelpCenterUrl() const {
119 return GURL(chrome::kChooserUsbOverviewURL); 118 return GURL(chrome::kChooserUsbOverviewURL);
120 } 119 }
121 120
(...skipping 13 matching lines...) Expand all
135 void UsbChooserBubbleController::set_bubble_reference( 134 void UsbChooserBubbleController::set_bubble_reference(
136 BubbleReference bubble_reference) { 135 BubbleReference bubble_reference) {
137 bubble_reference_ = bubble_reference; 136 bubble_reference_ = bubble_reference;
138 } 137 }
139 138
140 // Get a list of devices that can be shown in the chooser bubble UI for 139 // Get a list of devices that can be shown in the chooser bubble UI for
141 // user to grant permsssion. 140 // user to grant permsssion.
142 void UsbChooserBubbleController::GotUsbDeviceList( 141 void UsbChooserBubbleController::GotUsbDeviceList(
143 const std::vector<scoped_refptr<device::UsbDevice>>& devices) { 142 const std::vector<scoped_refptr<device::UsbDevice>>& devices) {
144 for (const auto& device : devices) { 143 for (const auto& device : devices) {
145 if (device::UsbDeviceFilter::MatchesAny(device, filters_) && 144 if (DisplayDevice(device))
146 FindInWebUsbAllowedOrigins(
147 device->webusb_allowed_origins(),
148 render_frame_host_->GetLastCommittedURL().GetOrigin())) {
149 devices_.push_back(std::make_pair(device, device->product_string())); 145 devices_.push_back(std::make_pair(device, device->product_string()));
150 }
151 } 146 }
152 if (observer()) 147 if (observer())
153 observer()->OnOptionsInitialized(); 148 observer()->OnOptionsInitialized();
154 } 149 }
150
151 bool UsbChooserBubbleController::DisplayDevice(
152 scoped_refptr<device::UsbDevice> device) const {
153 return device::UsbDeviceFilter::MatchesAny(device, filters_) &&
154 (base::CommandLine::ForCurrentProcess()->HasSwitch(
155 switches::kDisableWebUsbSecurity) ||
156 device::FindInWebUsbAllowedOrigins(
157 device->webusb_allowed_origins(),
158 render_frame_host_->GetLastCommittedURL().GetOrigin()));
159 }
OLDNEW
« no previous file with comments | « chrome/browser/usb/usb_chooser_bubble_controller.h ('k') | chrome/browser/usb/web_usb_permission_provider.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698