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

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

Issue 1554563002: Put more files under the enable_service_discovery build flag. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: fix typo Created 4 years, 11 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 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 11 matching lines...) Expand all
22 #include "base/message_loop/message_loop.h" 22 #include "base/message_loop/message_loop.h"
23 #include "base/prefs/pref_service.h" 23 #include "base/prefs/pref_service.h"
24 #include "base/strings/string_number_conversions.h" 24 #include "base/strings/string_number_conversions.h"
25 #include "base/strings/string_split.h" 25 #include "base/strings/string_split.h"
26 #include "base/strings/string_util.h" 26 #include "base/strings/string_util.h"
27 #include "base/strings/stringprintf.h" 27 #include "base/strings/stringprintf.h"
28 #include "base/strings/utf_string_conversions.h" 28 #include "base/strings/utf_string_conversions.h"
29 #include "base/threading/thread.h" 29 #include "base/threading/thread.h"
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/cast_device_provider.h"
33 #include "chrome/browser/devtools/device/port_forwarding_controller.h" 32 #include "chrome/browser/devtools/device/port_forwarding_controller.h"
34 #include "chrome/browser/devtools/device/tcp_device_provider.h" 33 #include "chrome/browser/devtools/device/tcp_device_provider.h"
35 #include "chrome/browser/devtools/device/usb/usb_device_provider.h" 34 #include "chrome/browser/devtools/device/usb/usb_device_provider.h"
36 #include "chrome/browser/devtools/device/webrtc/webrtc_device_provider.h"
37 #include "chrome/browser/devtools/devtools_protocol.h" 35 #include "chrome/browser/devtools/devtools_protocol.h"
38 #include "chrome/browser/devtools/devtools_target_impl.h" 36 #include "chrome/browser/devtools/devtools_target_impl.h"
39 #include "chrome/browser/devtools/devtools_window.h" 37 #include "chrome/browser/devtools/devtools_window.h"
40 #include "chrome/browser/devtools/remote_debugging_server.h" 38 #include "chrome/browser/devtools/remote_debugging_server.h"
41 #include "chrome/browser/profiles/profile.h" 39 #include "chrome/browser/profiles/profile.h"
42 #include "chrome/browser/signin/profile_oauth2_token_service_factory.h" 40 #include "chrome/browser/signin/profile_oauth2_token_service_factory.h"
43 #include "chrome/browser/signin/signin_manager_factory.h" 41 #include "chrome/browser/signin/signin_manager_factory.h"
44 #include "chrome/common/chrome_switches.h" 42 #include "chrome/common/chrome_switches.h"
45 #include "chrome/common/pref_names.h" 43 #include "chrome/common/pref_names.h"
46 #include "components/keyed_service/content/browser_context_dependency_manager.h" 44 #include "components/keyed_service/content/browser_context_dependency_manager.h"
47 #include "components/signin/core/browser/profile_oauth2_token_service.h" 45 #include "components/signin/core/browser/profile_oauth2_token_service.h"
48 #include "components/signin/core/browser/signin_manager.h" 46 #include "components/signin/core/browser/signin_manager.h"
49 #include "content/public/browser/devtools_agent_host.h" 47 #include "content/public/browser/devtools_agent_host.h"
50 #include "content/public/browser/devtools_external_agent_proxy.h" 48 #include "content/public/browser/devtools_external_agent_proxy.h"
51 #include "content/public/browser/devtools_external_agent_proxy_delegate.h" 49 #include "content/public/browser/devtools_external_agent_proxy_delegate.h"
52 #include "content/public/browser/user_metrics.h" 50 #include "content/public/browser/user_metrics.h"
53 #include "net/base/escape.h" 51 #include "net/base/escape.h"
54 #include "net/base/host_port_pair.h" 52 #include "net/base/host_port_pair.h"
55 #include "net/base/net_errors.h" 53 #include "net/base/net_errors.h"
56 54
55 #if defined(ENABLE_SERVICE_DISCOVERY)
56 #include "chrome/browser/devtools/device/cast_device_provider.h"
57 #include "chrome/browser/devtools/device/webrtc/webrtc_device_provider.h"
58 #endif
59
57 using content::BrowserThread; 60 using content::BrowserThread;
58 61
59 namespace { 62 namespace {
60 63
61 const char kPageListRequest[] = "/json"; 64 const char kPageListRequest[] = "/json";
62 const char kVersionRequest[] = "/json/version"; 65 const char kVersionRequest[] = "/json/version";
63 const char kClosePageRequest[] = "/json/close/%s"; 66 const char kClosePageRequest[] = "/json/close/%s";
64 const char kNewPageRequestWithURL[] = "/json/new?%s"; 67 const char kNewPageRequestWithURL[] = "/json/new?%s";
65 const char kActivatePageRequest[] = "/json/activate/%s"; 68 const char kActivatePageRequest[] = "/json/activate/%s";
66 const char kBrowserTargetSocket[] = "/devtools/browser"; 69 const char kBrowserTargetSocket[] = "/devtools/browser";
67 const int kAdbPollingIntervalMs = 1000; 70 const int kAdbPollingIntervalMs = 1000;
68 71
69 const char kPageReloadCommand[] = "Page.reload"; 72 const char kPageReloadCommand[] = "Page.reload";
70 73
71 const char kWebViewSocketPrefix[] = "webview_devtools_remote"; 74 const char kWebViewSocketPrefix[] = "webview_devtools_remote";
72 75
73 bool IsWebRTCDeviceProviderEnabled() { 76 bool IsWebRTCDeviceProviderEnabled() {
77 #if defined(ENABLE_SERVICE_DISCOVERY)
74 return base::CommandLine::ForCurrentProcess()->HasSwitch( 78 return base::CommandLine::ForCurrentProcess()->HasSwitch(
75 switches::kEnableDevToolsExperiments); 79 switches::kEnableDevToolsExperiments);
80 #else
81 return false;
82 #endif
76 } 83 }
77 84
78 bool BrowserIdFromString(const std::string& browser_id_str, 85 bool BrowserIdFromString(const std::string& browser_id_str,
79 DevToolsAndroidBridge::BrowserId* browser_id) { 86 DevToolsAndroidBridge::BrowserId* browser_id) {
80 size_t colon_pos = browser_id_str.find(':'); 87 size_t colon_pos = browser_id_str.find(':');
81 if (colon_pos == std::string::npos) 88 if (colon_pos == std::string::npos)
82 return false; 89 return false;
83 browser_id->first = browser_id_str.substr(0, colon_pos); 90 browser_id->first = browser_id_str.substr(0, colon_pos);
84 browser_id->second = browser_id_str.substr(colon_pos + 1); 91 browser_id->second = browser_id_str.substr(colon_pos + 1);
85 return true; 92 return true;
(...skipping 856 matching lines...) Expand 10 before | Expand all | Expand 10 after
942 if (targets.empty()) 949 if (targets.empty())
943 return nullptr; 950 return nullptr;
944 return new TCPDeviceProvider(targets); 951 return new TCPDeviceProvider(targets);
945 } 952 }
946 953
947 void DevToolsAndroidBridge::CreateDeviceProviders() { 954 void DevToolsAndroidBridge::CreateDeviceProviders() {
948 AndroidDeviceManager::DeviceProviders device_providers; 955 AndroidDeviceManager::DeviceProviders device_providers;
949 956
950 if (scoped_refptr<TCPDeviceProvider> provider = CreateTCPDeviceProvider()) 957 if (scoped_refptr<TCPDeviceProvider> provider = CreateTCPDeviceProvider())
951 device_providers.push_back(provider); 958 device_providers.push_back(provider);
959
960 #if defined(ENABLE_SERVICE_DISCOVERY)
952 device_providers.push_back(new CastDeviceProvider()); 961 device_providers.push_back(new CastDeviceProvider());
962 #endif
963
953 device_providers.push_back(new AdbDeviceProvider()); 964 device_providers.push_back(new AdbDeviceProvider());
954 965
955 PrefService* service = profile_->GetPrefs(); 966 PrefService* service = profile_->GetPrefs();
956 const PrefService::Preference* pref = 967 const PrefService::Preference* pref =
957 service->FindPreference(prefs::kDevToolsDiscoverUsbDevicesEnabled); 968 service->FindPreference(prefs::kDevToolsDiscoverUsbDevicesEnabled);
958 const base::Value* pref_value = pref->GetValue(); 969 const base::Value* pref_value = pref->GetValue();
959 970
960 bool enabled; 971 bool enabled;
961 if (pref_value->GetAsBoolean(&enabled) && enabled) { 972 if (pref_value->GetAsBoolean(&enabled) && enabled) {
962 device_providers.push_back(new UsbDeviceProvider(profile_)); 973 device_providers.push_back(new UsbDeviceProvider(profile_));
963 } 974 }
964 975
976 #if defined(ENABLE_SERVICE_DISCOVERY)
965 if (IsWebRTCDeviceProviderEnabled()) { 977 if (IsWebRTCDeviceProviderEnabled()) {
966 device_providers.push_back( 978 device_providers.push_back(
967 new WebRTCDeviceProvider(profile_, signin_manager_, token_service_)); 979 new WebRTCDeviceProvider(profile_, signin_manager_, token_service_));
968 } 980 }
981 #endif
969 982
970 device_manager_->SetDeviceProviders(device_providers); 983 device_manager_->SetDeviceProviders(device_providers);
971 if (NeedsDeviceListPolling()) { 984 if (NeedsDeviceListPolling()) {
972 StopDeviceListPolling(); 985 StopDeviceListPolling();
973 StartDeviceListPolling(); 986 StartDeviceListPolling();
974 } 987 }
975 } 988 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698