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

Side by Side Diff: chrome/browser/ui/webui/usb_internals/usb_internals_page_handler.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 2016 The Chromium Authors. All rights reserved. 1 // Copyright 2016 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/ui/webui/usb_internals/usb_internals_page_handler.h" 5 #include "chrome/browser/ui/webui/usb_internals/usb_internals_page_handler.h"
6 6
7 #include "base/macros.h" 7 #include "base/macros.h"
8 #include "base/strings/string16.h" 8 #include "base/strings/string16.h"
9 #include "base/strings/utf_string_conversions.h" 9 #include "base/strings/utf_string_conversions.h"
10 #include "device/core/device_client.h" 10 #include "device/base/device_client.h"
11 #include "device/usb/usb_device.h" 11 #include "device/usb/usb_device.h"
12 #include "device/usb/usb_device_handle.h" 12 #include "device/usb/usb_device_handle.h"
13 #include "device/usb/usb_service.h" 13 #include "device/usb/usb_service.h"
14 #include "device/usb/webusb_descriptors.h" 14 #include "device/usb/webusb_descriptors.h"
15 #include "url/gurl.h" 15 #include "url/gurl.h"
16 16
17 namespace { 17 namespace {
18 18
19 class TestUsbDevice : public device::UsbDevice { 19 class TestUsbDevice : public device::UsbDevice {
20 public: 20 public:
(...skipping 97 matching lines...) Expand 10 before | Expand all | Expand 10 after
118 device_info->landing_page = device->webusb_landing_page(); 118 device_info->landing_page = device->webusb_landing_page();
119 if (device->webusb_allowed_origins() && 119 if (device->webusb_allowed_origins() &&
120 !device->webusb_allowed_origins()->origins.empty()) { 120 !device->webusb_allowed_origins()->origins.empty()) {
121 device_info->allowed_origin = 121 device_info->allowed_origin =
122 url::Origin(device->webusb_allowed_origins()->origins.front()); 122 url::Origin(device->webusb_allowed_origins()->origins.front());
123 } 123 }
124 result.push_back(std::move(device_info)); 124 result.push_back(std::move(device_info));
125 } 125 }
126 callback.Run(std::move(result)); 126 callback.Run(std::move(result));
127 } 127 }
OLDNEW
« no previous file with comments | « chrome/browser/ui/webui/print_preview/extension_printer_handler_unittest.cc ('k') | chrome/browser/usb/DEPS » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698