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

Side by Side Diff: chrome/browser/ui/android/usb_chooser_dialog_android.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/android/usb_chooser_dialog_android.h" 5 #include "chrome/browser/ui/android/usb_chooser_dialog_android.h"
6 6
7 #include <stddef.h> 7 #include <stddef.h>
8 8
9 #include <algorithm> 9 #include <algorithm>
10 10
11 #include "base/android/jni_android.h" 11 #include "base/android/jni_android.h"
12 #include "base/android/jni_string.h" 12 #include "base/android/jni_string.h"
13 #include "base/bind.h" 13 #include "base/bind.h"
14 #include "base/strings/utf_string_conversions.h" 14 #include "base/strings/utf_string_conversions.h"
15 #include "chrome/browser/profiles/profile.h" 15 #include "chrome/browser/profiles/profile.h"
16 #include "chrome/browser/ssl/chrome_security_state_model_client.h" 16 #include "chrome/browser/ssl/chrome_security_state_model_client.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/common/url_constants.h" 20 #include "chrome/common/url_constants.h"
21 #include "components/url_formatter/elide_url.h" 21 #include "components/url_formatter/elide_url.h"
22 #include "content/public/browser/android/content_view_core.h" 22 #include "content/public/browser/android/content_view_core.h"
23 #include "content/public/browser/render_frame_host.h" 23 #include "content/public/browser/render_frame_host.h"
24 #include "content/public/browser/web_contents.h" 24 #include "content/public/browser/web_contents.h"
25 #include "device/core/device_client.h" 25 #include "device/base/device_client.h"
26 #include "device/usb/mojo/type_converters.h" 26 #include "device/usb/mojo/type_converters.h"
27 #include "device/usb/usb_device.h" 27 #include "device/usb/usb_device.h"
28 #include "device/usb/usb_device_filter.h" 28 #include "device/usb/usb_device_filter.h"
29 #include "device/usb/webusb_descriptors.h" 29 #include "device/usb/webusb_descriptors.h"
30 #include "jni/UsbChooserDialog_jni.h" 30 #include "jni/UsbChooserDialog_jni.h"
31 #include "mojo/common/common_type_converters.h" 31 #include "mojo/common/common_type_converters.h"
32 #include "ui/android/window_android.h" 32 #include "ui/android/window_android.h"
33 #include "url/gurl.h" 33 #include "url/gurl.h"
34 34
35 using device::UsbDevice; 35 using device::UsbDevice;
(...skipping 203 matching lines...) Expand 10 before | Expand all | Expand 10 after
239 239
240 return device::FindInWebUsbAllowedOrigins( 240 return device::FindInWebUsbAllowedOrigins(
241 device->webusb_allowed_origins(), 241 device->webusb_allowed_origins(),
242 render_frame_host_->GetLastCommittedURL().GetOrigin()); 242 render_frame_host_->GetLastCommittedURL().GetOrigin());
243 } 243 }
244 244
245 // static 245 // static
246 bool UsbChooserDialogAndroid::Register(JNIEnv* env) { 246 bool UsbChooserDialogAndroid::Register(JNIEnv* env) {
247 return RegisterNativesImpl(env); 247 return RegisterNativesImpl(env);
248 } 248 }
OLDNEW
« no previous file with comments | « chrome/browser/ui/BUILD.gn ('k') | chrome/browser/ui/views/website_settings/website_settings_popup_view_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698