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

Side by Side Diff: chrome/browser/devtools/device/devtools_android_bridge.cc

Issue 2407483002: Make enable_service_discovery a chrome/ feature. (Closed)
Patch Set: 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
« no previous file with comments | « chrome/browser/devtools/BUILD.gn ('k') | chrome/browser/extensions/api/mdns/dns_sd_registry.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 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/devtools/device/devtools_android_bridge.h" 5 #include "chrome/browser/devtools/device/devtools_android_bridge.h"
6 6
7 #include <stddef.h> 7 #include <stddef.h>
8 #include <algorithm> 8 #include <algorithm>
9 #include <map> 9 #include <map>
10 #include <set> 10 #include <set>
(...skipping 19 matching lines...) Expand all
30 #include "base/values.h" 30 #include "base/values.h"
31 #include "chrome/browser/devtools/device/adb/adb_device_provider.h" 31 #include "chrome/browser/devtools/device/adb/adb_device_provider.h"
32 #include "chrome/browser/devtools/device/port_forwarding_controller.h" 32 #include "chrome/browser/devtools/device/port_forwarding_controller.h"
33 #include "chrome/browser/devtools/device/tcp_device_provider.h" 33 #include "chrome/browser/devtools/device/tcp_device_provider.h"
34 #include "chrome/browser/devtools/device/usb/usb_device_provider.h" 34 #include "chrome/browser/devtools/device/usb/usb_device_provider.h"
35 #include "chrome/browser/devtools/devtools_protocol.h" 35 #include "chrome/browser/devtools/devtools_protocol.h"
36 #include "chrome/browser/devtools/devtools_window.h" 36 #include "chrome/browser/devtools/devtools_window.h"
37 #include "chrome/browser/devtools/remote_debugging_server.h" 37 #include "chrome/browser/devtools/remote_debugging_server.h"
38 #include "chrome/browser/profiles/profile.h" 38 #include "chrome/browser/profiles/profile.h"
39 #include "chrome/common/chrome_switches.h" 39 #include "chrome/common/chrome_switches.h"
40 #include "chrome/common/features.h"
40 #include "chrome/common/pref_names.h" 41 #include "chrome/common/pref_names.h"
41 #include "components/keyed_service/content/browser_context_dependency_manager.h" 42 #include "components/keyed_service/content/browser_context_dependency_manager.h"
42 #include "components/prefs/pref_service.h" 43 #include "components/prefs/pref_service.h"
43 #include "components/signin/core/browser/profile_oauth2_token_service.h" 44 #include "components/signin/core/browser/profile_oauth2_token_service.h"
44 #include "components/signin/core/browser/signin_manager.h" 45 #include "components/signin/core/browser/signin_manager.h"
45 #include "content/public/browser/devtools_agent_host.h" 46 #include "content/public/browser/devtools_agent_host.h"
46 #include "content/public/browser/devtools_external_agent_proxy.h" 47 #include "content/public/browser/devtools_external_agent_proxy.h"
47 #include "content/public/browser/devtools_external_agent_proxy_delegate.h" 48 #include "content/public/browser/devtools_external_agent_proxy_delegate.h"
48 #include "content/public/browser/user_metrics.h" 49 #include "content/public/browser/user_metrics.h"
49 #include "net/base/escape.h" 50 #include "net/base/escape.h"
50 #include "net/base/host_port_pair.h" 51 #include "net/base/host_port_pair.h"
51 #include "net/base/net_errors.h" 52 #include "net/base/net_errors.h"
52 53
53 #if defined(ENABLE_SERVICE_DISCOVERY) 54 #if BUILDFLAG(ENABLE_SERVICE_DISCOVERY)
54 #include "chrome/browser/devtools/device/cast_device_provider.h" 55 #include "chrome/browser/devtools/device/cast_device_provider.h"
55 #endif 56 #endif
56 57
57 using content::BrowserThread; 58 using content::BrowserThread;
58 using content::DevToolsAgentHost; 59 using content::DevToolsAgentHost;
59 60
60 namespace { 61 namespace {
61 62
62 const char kPageListRequest[] = "/json"; 63 const char kPageListRequest[] = "/json";
63 const char kVersionRequest[] = "/json/version"; 64 const char kVersionRequest[] = "/json/version";
(...skipping 877 matching lines...) Expand 10 before | Expand all | Expand 10 after
941 service->GetBoolean(prefs::kDevToolsDiscoverTCPTargetsEnabled) 942 service->GetBoolean(prefs::kDevToolsDiscoverTCPTargetsEnabled)
942 ? service->GetList(prefs::kDevToolsTCPDiscoveryConfig) 943 ? service->GetList(prefs::kDevToolsTCPDiscoveryConfig)
943 : nullptr; 944 : nullptr;
944 scoped_refptr<TCPDeviceProvider> provider = CreateTCPDeviceProvider(targets); 945 scoped_refptr<TCPDeviceProvider> provider = CreateTCPDeviceProvider(targets);
945 if (tcp_provider_callback_) 946 if (tcp_provider_callback_)
946 tcp_provider_callback_.Run(provider); 947 tcp_provider_callback_.Run(provider);
947 948
948 if (provider) 949 if (provider)
949 device_providers.push_back(provider); 950 device_providers.push_back(provider);
950 951
951 #if defined(ENABLE_SERVICE_DISCOVERY) 952 #if BUILDFLAG(ENABLE_SERVICE_DISCOVERY)
952 device_providers.push_back(new CastDeviceProvider()); 953 device_providers.push_back(new CastDeviceProvider());
953 #endif 954 #endif
954 955
955 device_providers.push_back(new AdbDeviceProvider()); 956 device_providers.push_back(new AdbDeviceProvider());
956 957
957 const PrefService::Preference* pref = 958 const PrefService::Preference* pref =
958 service->FindPreference(prefs::kDevToolsDiscoverUsbDevicesEnabled); 959 service->FindPreference(prefs::kDevToolsDiscoverUsbDevicesEnabled);
959 const base::Value* pref_value = pref->GetValue(); 960 const base::Value* pref_value = pref->GetValue();
960 961
961 bool enabled; 962 bool enabled;
962 if (pref_value->GetAsBoolean(&enabled) && enabled) { 963 if (pref_value->GetAsBoolean(&enabled) && enabled) {
963 device_providers.push_back(new UsbDeviceProvider(profile_)); 964 device_providers.push_back(new UsbDeviceProvider(profile_));
964 } 965 }
965 966
966 device_manager_->SetDeviceProviders(device_providers); 967 device_manager_->SetDeviceProviders(device_providers);
967 if (NeedsDeviceListPolling()) { 968 if (NeedsDeviceListPolling()) {
968 StopDeviceListPolling(); 969 StopDeviceListPolling();
969 StartDeviceListPolling(); 970 StartDeviceListPolling();
970 } 971 }
971 } 972 }
972 973
973 void DevToolsAndroidBridge::set_tcp_provider_callback_for_test( 974 void DevToolsAndroidBridge::set_tcp_provider_callback_for_test(
974 TCPProviderCallback callback) { 975 TCPProviderCallback callback) {
975 tcp_provider_callback_ = callback; 976 tcp_provider_callback_ = callback;
976 CreateDeviceProviders(); 977 CreateDeviceProviders();
977 } 978 }
OLDNEW
« no previous file with comments | « chrome/browser/devtools/BUILD.gn ('k') | chrome/browser/extensions/api/mdns/dns_sd_registry.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698