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

Unified Diff: extensions/browser/api/serial/serial_api.cc

Issue 1416513006: Aura on Android: compile gn target extensions/browser. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@content_unittests
Patch Set: Revert the changes in features.gni. Created 5 years, 1 month 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « device/usb/BUILD.gn ('k') | extensions/browser/guest_view/web_view/web_view_guest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: extensions/browser/api/serial/serial_api.cc
diff --git a/extensions/browser/api/serial/serial_api.cc b/extensions/browser/api/serial/serial_api.cc
index de70d1ad1395362af81382c84cbf883cc6b10d8b..9b8a89d897ad991228d53cf84ddefcbe1ec5103d 100644
--- a/extensions/browser/api/serial/serial_api.cc
+++ b/extensions/browser/api/serial/serial_api.cc
@@ -85,11 +85,14 @@ bool SerialGetDevicesFunction::Prepare() {
void SerialGetDevicesFunction::Work() {
DCHECK_CURRENTLY_ON(BrowserThread::FILE);
+// TODO(moshayedi): crbug.com/549257. Add USB support for Aura on Android.
+#if !defined(OS_ANDROID)
scoped_ptr<device::SerialDeviceEnumerator> enumerator =
device::SerialDeviceEnumerator::Create();
mojo::Array<device::serial::DeviceInfoPtr> devices = enumerator->GetDevices();
results_ = serial::GetDevices::Results::Create(
devices.To<std::vector<linked_ptr<serial::DeviceInfo> > >());
+#endif
}
SerialConnectFunction::SerialConnectFunction() {
« no previous file with comments | « device/usb/BUILD.gn ('k') | extensions/browser/guest_view/web_view/web_view_guest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698