Index: chrome/browser/printing/cloud_print/privet_notifications.cc |
diff --git a/chrome/browser/local_discovery/privet_notifications.cc b/chrome/browser/printing/cloud_print/privet_notifications.cc |
similarity index 95% |
rename from chrome/browser/local_discovery/privet_notifications.cc |
rename to chrome/browser/printing/cloud_print/privet_notifications.cc |
index 4913576062fe50e178d103851c6c13f8a4af3795..81c8120eff320a9ff132639ab2f8266e8f59d8bd 100644 |
--- a/chrome/browser/local_discovery/privet_notifications.cc |
+++ b/chrome/browser/printing/cloud_print/privet_notifications.cc |
@@ -2,7 +2,7 @@ |
// Use of this source code is governed by a BSD-style license that can be |
// found in the LICENSE file. |
-#include "chrome/browser/local_discovery/privet_notifications.h" |
+#include "chrome/browser/printing/cloud_print/privet_notifications.h" |
#include <utility> |
@@ -16,11 +16,11 @@ |
#include "base/strings/utf_string_conversions.h" |
#include "base/thread_task_runner_handle.h" |
#include "chrome/browser/browser_process.h" |
-#include "chrome/browser/local_discovery/privet_device_lister_impl.h" |
-#include "chrome/browser/local_discovery/privet_http_asynchronous_factory.h" |
#include "chrome/browser/local_discovery/service_discovery_shared_client.h" |
#include "chrome/browser/notifications/notification.h" |
#include "chrome/browser/notifications/notification_ui_manager.h" |
+#include "chrome/browser/printing/cloud_print/privet_device_lister_impl.h" |
+#include "chrome/browser/printing/cloud_print/privet_http_asynchronous_factory.h" |
#include "chrome/browser/profiles/profile.h" |
#include "chrome/browser/signin/signin_manager_factory.h" |
#include "chrome/browser/ui/browser.h" |
@@ -44,10 +44,10 @@ |
#include "ui/message_center/notifier_settings.h" |
#if defined(ENABLE_MDNS) |
-#include "chrome/browser/local_discovery/privet_traffic_detector.h" |
+#include "chrome/browser/printing/cloud_print/privet_traffic_detector.h" |
#endif |
-namespace local_discovery { |
+namespace cloud_print { |
namespace { |
@@ -270,7 +270,8 @@ void PrivetNotificationService::PrivetNotify(int devices_active, |
bool updated = g_browser_process->notification_ui_manager()->Update( |
notification, profile_object); |
- if (!updated && added && !LocalDiscoveryUIHandler::GetHasVisible()) { |
+ if (!updated && added && |
+ !local_discovery::LocalDiscoveryUIHandler::GetHasVisible()) { |
ReportPrivetUmaEvent(PRIVET_NOTIFICATION_SHOWN); |
g_browser_process->notification_ui_manager()->Add(notification, |
profile_object); |
@@ -336,7 +337,8 @@ void PrivetNotificationService::StartLister() { |
#if defined(ENABLE_MDNS) |
traffic_detector_ = NULL; |
#endif // ENABLE_MDNS |
- service_discovery_client_ = ServiceDiscoverySharedClient::GetInstance(); |
+ service_discovery_client_ = |
+ local_discovery::ServiceDiscoverySharedClient::GetInstance(); |
device_lister_.reset( |
new PrivetDeviceListerImpl(service_discovery_client_.get(), this)); |
device_lister_->Start(); |
@@ -390,4 +392,4 @@ void PrivetNotificationDelegate::DisableNotifications() { |
false); |
} |
-} // namespace local_discovery |
+} // namespace cloud_print |