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

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

Issue 2581543002: Add infrastructure for a USB device blocklist. (Closed)
Patch Set: Fix typo. Created 4 years 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_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 "base/strings/stringprintf.h" 12 #include "base/strings/stringprintf.h"
13 #include "base/strings/utf_string_conversions.h" 13 #include "base/strings/utf_string_conversions.h"
14 #include "chrome/browser/net/referrer.h" 14 #include "chrome/browser/net/referrer.h"
15 #include "chrome/browser/profiles/profile.h" 15 #include "chrome/browser/profiles/profile.h"
16 #include "chrome/browser/profiles/profile_manager.h" 16 #include "chrome/browser/profiles/profile_manager.h"
17 #include "chrome/browser/ui/browser.h" 17 #include "chrome/browser/ui/browser.h"
18 #include "chrome/browser/ui/scoped_tabbed_browser_displayer.h" 18 #include "chrome/browser/ui/scoped_tabbed_browser_displayer.h"
19 #include "chrome/browser/usb/usb_blocklist.h"
19 #include "chrome/browser/usb/usb_chooser_context.h" 20 #include "chrome/browser/usb/usb_chooser_context.h"
20 #include "chrome/browser/usb/usb_chooser_context_factory.h" 21 #include "chrome/browser/usb/usb_chooser_context_factory.h"
21 #include "chrome/browser/usb/web_usb_histograms.h" 22 #include "chrome/browser/usb/web_usb_histograms.h"
22 #include "chrome/browser/usb/web_usb_permission_provider.h" 23 #include "chrome/browser/usb/web_usb_permission_provider.h"
23 #include "chrome/common/chrome_switches.h" 24 #include "chrome/common/chrome_switches.h"
24 #include "chrome/common/url_constants.h" 25 #include "chrome/common/url_constants.h"
25 #include "chrome/grit/generated_resources.h" 26 #include "chrome/grit/generated_resources.h"
26 #include "content/public/browser/render_frame_host.h" 27 #include "content/public/browser/render_frame_host.h"
27 #include "content/public/browser/web_contents.h" 28 #include "content/public/browser/web_contents.h"
28 #include "device/base/device_client.h" 29 #include "device/base/device_client.h"
(...skipping 187 matching lines...) Expand 10 before | Expand all | Expand 10 after
216 ++device_name_map_[device_name]; 217 ++device_name_map_[device_name];
217 } 218 }
218 } 219 }
219 if (view()) 220 if (view())
220 view()->OnOptionsInitialized(); 221 view()->OnOptionsInitialized();
221 } 222 }
222 223
223 bool UsbChooserController::DisplayDevice( 224 bool UsbChooserController::DisplayDevice(
224 scoped_refptr<device::UsbDevice> device) const { 225 scoped_refptr<device::UsbDevice> device) const {
225 return device::UsbDeviceFilter::MatchesAny(device, filters_) && 226 return device::UsbDeviceFilter::MatchesAny(device, filters_) &&
227 !UsbBlocklist::Get().IsExcluded(device) &&
226 (base::CommandLine::ForCurrentProcess()->HasSwitch( 228 (base::CommandLine::ForCurrentProcess()->HasSwitch(
227 switches::kDisableWebUsbSecurity) || 229 switches::kDisableWebUsbSecurity) ||
228 device::FindInWebUsbAllowedOrigins( 230 device::FindInWebUsbAllowedOrigins(
229 device->webusb_allowed_origins(), 231 device->webusb_allowed_origins(),
230 render_frame_host_->GetLastCommittedURL().GetOrigin())); 232 render_frame_host_->GetLastCommittedURL().GetOrigin()));
231 } 233 }
OLDNEW
« no previous file with comments | « chrome/browser/usb/usb_blocklist_unittest.cc ('k') | chrome/browser/usb/web_usb_permission_provider.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698