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

Unified 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/browser/devtools/BUILD.gn ('k') | chrome/browser/extensions/BUILD.gn » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/devtools/device/devtools_android_bridge.cc
diff --git a/chrome/browser/devtools/device/devtools_android_bridge.cc b/chrome/browser/devtools/device/devtools_android_bridge.cc
index 5cc5b77848474dfe5c13976367584264bc8d3669..dbe64ee7fb127ead5a4be27aab7542adb6c4eb2a 100644
--- a/chrome/browser/devtools/device/devtools_android_bridge.cc
+++ b/chrome/browser/devtools/device/devtools_android_bridge.cc
@@ -29,7 +29,6 @@
#include "base/threading/thread.h"
#include "base/values.h"
#include "chrome/browser/devtools/device/adb/adb_device_provider.h"
-#include "chrome/browser/devtools/device/cast_device_provider.h"
#include "chrome/browser/devtools/device/port_forwarding_controller.h"
#include "chrome/browser/devtools/device/tcp_device_provider.h"
#include "chrome/browser/devtools/device/usb/usb_device_provider.h"
@@ -51,6 +50,10 @@
#include "net/base/host_port_pair.h"
#include "net/base/net_errors.h"
+#if defined(ENABLE_SERVICE_DISCOVERY)
+#include "chrome/browser/devtools/device/cast_device_provider.h"
+#endif
+
using content::BrowserThread;
namespace {
@@ -924,7 +927,11 @@ void DevToolsAndroidBridge::CreateDeviceProviders() {
if (scoped_refptr<TCPDeviceProvider> provider = CreateTCPDeviceProvider())
device_providers.push_back(provider);
+
+#if defined(ENABLE_SERVICE_DISCOVERY)
device_providers.push_back(new CastDeviceProvider());
+#endif
+
device_providers.push_back(new AdbDeviceProvider());
PrefService* service = profile_->GetPrefs();
« 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