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

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: more fix merge 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
« no previous file with comments | « chrome/browser/devtools/BUILD.gn ('k') | chrome/browser/extensions/BUILD.gn » ('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 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/devtools_protocol.h" 35 #include "chrome/browser/devtools/devtools_protocol.h"
37 #include "chrome/browser/devtools/devtools_target_impl.h" 36 #include "chrome/browser/devtools/devtools_target_impl.h"
38 #include "chrome/browser/devtools/devtools_window.h" 37 #include "chrome/browser/devtools/devtools_window.h"
39 #include "chrome/browser/devtools/remote_debugging_server.h" 38 #include "chrome/browser/devtools/remote_debugging_server.h"
40 #include "chrome/browser/profiles/profile.h" 39 #include "chrome/browser/profiles/profile.h"
41 #include "chrome/common/chrome_switches.h" 40 #include "chrome/common/chrome_switches.h"
42 #include "chrome/common/pref_names.h" 41 #include "chrome/common/pref_names.h"
43 #include "components/keyed_service/content/browser_context_dependency_manager.h" 42 #include "components/keyed_service/content/browser_context_dependency_manager.h"
44 #include "components/signin/core/browser/profile_oauth2_token_service.h" 43 #include "components/signin/core/browser/profile_oauth2_token_service.h"
45 #include "components/signin/core/browser/signin_manager.h" 44 #include "components/signin/core/browser/signin_manager.h"
46 #include "content/public/browser/devtools_agent_host.h" 45 #include "content/public/browser/devtools_agent_host.h"
47 #include "content/public/browser/devtools_external_agent_proxy.h" 46 #include "content/public/browser/devtools_external_agent_proxy.h"
48 #include "content/public/browser/devtools_external_agent_proxy_delegate.h" 47 #include "content/public/browser/devtools_external_agent_proxy_delegate.h"
49 #include "content/public/browser/user_metrics.h" 48 #include "content/public/browser/user_metrics.h"
50 #include "net/base/escape.h" 49 #include "net/base/escape.h"
51 #include "net/base/host_port_pair.h" 50 #include "net/base/host_port_pair.h"
52 #include "net/base/net_errors.h" 51 #include "net/base/net_errors.h"
53 52
53 #if defined(ENABLE_SERVICE_DISCOVERY)
54 #include "chrome/browser/devtools/device/cast_device_provider.h"
55 #endif
56
54 using content::BrowserThread; 57 using content::BrowserThread;
55 58
56 namespace { 59 namespace {
57 60
58 const char kPageListRequest[] = "/json"; 61 const char kPageListRequest[] = "/json";
59 const char kVersionRequest[] = "/json/version"; 62 const char kVersionRequest[] = "/json/version";
60 const char kClosePageRequest[] = "/json/close/%s"; 63 const char kClosePageRequest[] = "/json/close/%s";
61 const char kNewPageRequestWithURL[] = "/json/new?%s"; 64 const char kNewPageRequestWithURL[] = "/json/new?%s";
62 const char kActivatePageRequest[] = "/json/activate/%s"; 65 const char kActivatePageRequest[] = "/json/activate/%s";
63 const char kBrowserTargetSocket[] = "/devtools/browser"; 66 const char kBrowserTargetSocket[] = "/devtools/browser";
(...skipping 853 matching lines...) Expand 10 before | Expand all | Expand 10 after
917 if (targets.empty()) 920 if (targets.empty())
918 return nullptr; 921 return nullptr;
919 return new TCPDeviceProvider(targets); 922 return new TCPDeviceProvider(targets);
920 } 923 }
921 924
922 void DevToolsAndroidBridge::CreateDeviceProviders() { 925 void DevToolsAndroidBridge::CreateDeviceProviders() {
923 AndroidDeviceManager::DeviceProviders device_providers; 926 AndroidDeviceManager::DeviceProviders device_providers;
924 927
925 if (scoped_refptr<TCPDeviceProvider> provider = CreateTCPDeviceProvider()) 928 if (scoped_refptr<TCPDeviceProvider> provider = CreateTCPDeviceProvider())
926 device_providers.push_back(provider); 929 device_providers.push_back(provider);
930
931 #if defined(ENABLE_SERVICE_DISCOVERY)
927 device_providers.push_back(new CastDeviceProvider()); 932 device_providers.push_back(new CastDeviceProvider());
933 #endif
934
928 device_providers.push_back(new AdbDeviceProvider()); 935 device_providers.push_back(new AdbDeviceProvider());
929 936
930 PrefService* service = profile_->GetPrefs(); 937 PrefService* service = profile_->GetPrefs();
931 const PrefService::Preference* pref = 938 const PrefService::Preference* pref =
932 service->FindPreference(prefs::kDevToolsDiscoverUsbDevicesEnabled); 939 service->FindPreference(prefs::kDevToolsDiscoverUsbDevicesEnabled);
933 const base::Value* pref_value = pref->GetValue(); 940 const base::Value* pref_value = pref->GetValue();
934 941
935 bool enabled; 942 bool enabled;
936 if (pref_value->GetAsBoolean(&enabled) && enabled) { 943 if (pref_value->GetAsBoolean(&enabled) && enabled) {
937 device_providers.push_back(new UsbDeviceProvider(profile_)); 944 device_providers.push_back(new UsbDeviceProvider(profile_));
938 } 945 }
939 946
940 device_manager_->SetDeviceProviders(device_providers); 947 device_manager_->SetDeviceProviders(device_providers);
941 if (NeedsDeviceListPolling()) { 948 if (NeedsDeviceListPolling()) {
942 StopDeviceListPolling(); 949 StopDeviceListPolling();
943 StartDeviceListPolling(); 950 StartDeviceListPolling();
944 } 951 }
945 } 952 }
OLDNEW
« no previous file with comments | « chrome/browser/devtools/BUILD.gn ('k') | chrome/browser/extensions/BUILD.gn » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698