chrome/browser/ui/webui/inspect_ui.cc - Issue 26568004: Introduced AndroidDeviceProvider to simplify testing.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

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: Made AndroidDevice::HttpQuery virtual for test purposes. 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:

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 4a7253d72cf6a80368fa9fb53dc1c1eb21249725..84def4440f4fecbe5faa192a5c752a88b4098c50 100644

--- a/chrome/browser/ui/webui/inspect_ui.cc

+++ b/chrome/browser/ui/webui/inspect_ui.cc

@@ -793,7 +793,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);

}