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

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

Issue 2417043002: Move device/core files to device/base directory. (Closed)
Patch Set: Fix ChromeOS build Created 4 years, 2 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_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/browser/usb/web_usb_permission_provider.h"
21 #include "chrome/common/chrome_switches.h" 21 #include "chrome/common/chrome_switches.h"
22 #include "chrome/common/url_constants.h" 22 #include "chrome/common/url_constants.h"
23 #include "chrome/grit/generated_resources.h" 23 #include "chrome/grit/generated_resources.h"
24 #include "content/public/browser/render_frame_host.h" 24 #include "content/public/browser/render_frame_host.h"
25 #include "content/public/browser/web_contents.h" 25 #include "content/public/browser/web_contents.h"
26 #include "device/core/device_client.h" 26 #include "device/base/device_client.h"
27 #include "device/usb/mojo/type_converters.h" 27 #include "device/usb/mojo/type_converters.h"
28 #include "device/usb/usb_device.h" 28 #include "device/usb/usb_device.h"
29 #include "device/usb/usb_device_filter.h" 29 #include "device/usb/usb_device_filter.h"
30 #include "device/usb/webusb_descriptors.h" 30 #include "device/usb/webusb_descriptors.h"
31 #include "ui/base/l10n/l10n_util.h" 31 #include "ui/base/l10n/l10n_util.h"
32 #include "url/gurl.h" 32 #include "url/gurl.h"
33 33
34 namespace { 34 namespace {
35 35
36 Browser* GetBrowser() { 36 Browser* GetBrowser() {
(...skipping 156 matching lines...) Expand 10 before | Expand all | Expand 10 after
193 193
194 bool UsbChooserController::DisplayDevice( 194 bool UsbChooserController::DisplayDevice(
195 scoped_refptr<device::UsbDevice> device) const { 195 scoped_refptr<device::UsbDevice> device) const {
196 return device::UsbDeviceFilter::MatchesAny(device, filters_) && 196 return device::UsbDeviceFilter::MatchesAny(device, filters_) &&
197 (base::CommandLine::ForCurrentProcess()->HasSwitch( 197 (base::CommandLine::ForCurrentProcess()->HasSwitch(
198 switches::kDisableWebUsbSecurity) || 198 switches::kDisableWebUsbSecurity) ||
199 device::FindInWebUsbAllowedOrigins( 199 device::FindInWebUsbAllowedOrigins(
200 device->webusb_allowed_origins(), 200 device->webusb_allowed_origins(),
201 render_frame_host_->GetLastCommittedURL().GetOrigin())); 201 render_frame_host_->GetLastCommittedURL().GetOrigin()));
202 } 202 }
OLDNEW
« no previous file with comments | « chrome/browser/usb/usb_chooser_context_unittest.cc ('k') | chrome/browser/usb/usb_chooser_controller_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698