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

Unified Diff: chrome/browser/local_discovery/storage/privet_volume_lister.cc

Issue 195983023: Enable devices page UI on MacOSX (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@fix_dcheck
Patch Set: Created 6 years, 9 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
Index: chrome/browser/local_discovery/storage/privet_volume_lister.cc
diff --git a/chrome/browser/local_discovery/storage/privet_volume_lister.cc b/chrome/browser/local_discovery/storage/privet_volume_lister.cc
index 9be6dc7c3b7857fef4eba11248311a12b1860a99..ed640fc5310d21e96343a2c0e2e33771dfa87e63 100644
--- a/chrome/browser/local_discovery/storage/privet_volume_lister.cc
+++ b/chrome/browser/local_discovery/storage/privet_volume_lister.cc
@@ -9,7 +9,7 @@
#include "base/time/time.h"
#include "chrome/browser/local_discovery/storage/privet_filesystem_constants.h"
-#if defined(ENABLE_MDNS)
+#if defined(ENABLE_SERVICE_DISCOVERY)
#include "chrome/browser/local_discovery/privet_device_lister_impl.h"
#endif
@@ -17,7 +17,7 @@ namespace local_discovery {
namespace {
-#if defined(ENABLE_MDNS)
+#if defined(ENABLE_SERVICE_DISCOVERY)
const int kVolumeSearchDurationMs = 10000;
std::string EscapeSlashes(const std::string& str) {
@@ -55,7 +55,7 @@ std::string RemoveSlashes(const std::string& str) {
return output;
}
-#endif // ENABLE_MDNS
+#endif // ENABLE_SERVICE_DISCOVERY
} // namespace
@@ -67,7 +67,7 @@ PrivetVolumeLister::~PrivetVolumeLister() {
}
void PrivetVolumeLister::Start() {
-#if defined(ENABLE_MDNS)
+#if defined(ENABLE_SERVICE_DISCOVERY)
service_discovery_client_ = ServiceDiscoverySharedClient::GetInstance();
privet_lister_.reset(new PrivetDeviceListerImpl(service_discovery_client_,
this));
@@ -83,8 +83,7 @@ void PrivetVolumeLister::Start() {
#endif
}
-
-#if defined(ENABLE_MDNS)
+#if defined(ENABLE_SERVICE_DISCOVERY)
void PrivetVolumeLister::DeviceChanged(bool added,
const std::string& name,
const DeviceDescription& description) {
« no previous file with comments | « chrome/browser/local_discovery/storage/privet_volume_lister.h ('k') | chrome/browser/prefs/browser_prefs.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698