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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: chrome/browser/ui/webui/inspect_ui.cc

Issue 26568004: Introduced AndroidDeviceProvider to simplify testing. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fixed all the comments. Created 7 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 side-by-side diff with in-line comments
Download patch
« chrome/browser/devtools/devtools_adb_bridge.h ('K') | « chrome/browser/devtools/refcounted_adb_thread.cc ('k') | chrome/chrome.gyp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/ui/webui/inspect_ui.cc
diff --git a/chrome/browser/ui/webui/inspect_ui.cc b/chrome/browser/ui/webui/inspect_ui.cc
index cdc4748e4cf0d41a3795ba8fee901c59990cc089..ab691fdb391fadf847669540e23d8e9476d8209b 100644
--- a/chrome/browser/ui/webui/inspect_ui.cc
+++ b/chrome/browser/ui/webui/inspect_ui.cc
@@ -782,7 +782,16 @@ void InspectUI::UpdateDiscoverUsbDevicesEnabled() {
if (adb_bridge) {
bool enabled = false;
value->GetAsBoolean(&enabled);
- adb_bridge->set_discover_usb_devices(enabled);
+
+ DevToolsAdbBridge::DeviceProviders device_providers;
+ device_providers.push_back(AndroidDeviceProvider::GetAdbDeviceProvider());
+
+ if (enabled) {
+ device_providers.push_back(
+ AndroidDeviceProvider::GetUsbDeviceProvider(profile));
+ }
+
+ adb_bridge->set_device_providers(device_providers);
}
}
« chrome/browser/devtools/devtools_adb_bridge.h ('K') | « chrome/browser/devtools/refcounted_adb_thread.cc ('k') | chrome/chrome.gyp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698