| Index: chrome/browser/printing/cloud_print/privet_device_lister_impl.h
|
| diff --git a/chrome/browser/local_discovery/privet_device_lister_impl.h b/chrome/browser/printing/cloud_print/privet_device_lister_impl.h
|
| similarity index 50%
|
| rename from chrome/browser/local_discovery/privet_device_lister_impl.h
|
| rename to chrome/browser/printing/cloud_print/privet_device_lister_impl.h
|
| index 2a41009b5a75bd7b68ab3d62867065fabfc6203a..fa711cac4d7a90ab2f891e0c28ceb66039e5b0c1 100644
|
| --- a/chrome/browser/local_discovery/privet_device_lister_impl.h
|
| +++ b/chrome/browser/printing/cloud_print/privet_device_lister_impl.h
|
| @@ -2,28 +2,31 @@
|
| // Use of this source code is governed by a BSD-style license that can be
|
| // found in the LICENSE file.
|
|
|
| -#ifndef CHROME_BROWSER_LOCAL_DISCOVERY_PRIVET_DEVICE_LISTER_IMPL_H_
|
| -#define CHROME_BROWSER_LOCAL_DISCOVERY_PRIVET_DEVICE_LISTER_IMPL_H_
|
| +#ifndef CHROME_BROWSER_PRINTING_CLOUD_PRINT_PRIVET_DEVICE_LISTER_IMPL_H_
|
| +#define CHROME_BROWSER_PRINTING_CLOUD_PRINT_PRIVET_DEVICE_LISTER_IMPL_H_
|
|
|
| #include <string>
|
|
|
| -#include "chrome/browser/local_discovery/privet_device_lister.h"
|
| #include "chrome/browser/local_discovery/service_discovery_device_lister.h"
|
| +#include "chrome/browser/printing/cloud_print/privet_device_lister.h"
|
|
|
| namespace local_discovery {
|
| -
|
| class ServiceDiscoveryClient;
|
| +}
|
| +
|
| +namespace cloud_print {
|
|
|
| -class PrivetDeviceListerImpl : public PrivetDeviceLister,
|
| - public ServiceDiscoveryDeviceLister::Delegate {
|
| +class PrivetDeviceListerImpl
|
| + : public PrivetDeviceLister,
|
| + public local_discovery::ServiceDiscoveryDeviceLister::Delegate {
|
| public:
|
| PrivetDeviceListerImpl(
|
| - ServiceDiscoveryClient* service_discovery_client,
|
| + local_discovery::ServiceDiscoveryClient* service_discovery_client,
|
| PrivetDeviceLister::Delegate* delegate,
|
| const std::string& subtype);
|
|
|
| PrivetDeviceListerImpl(
|
| - ServiceDiscoveryClient* service_discovery_client,
|
| + local_discovery::ServiceDiscoveryClient* service_discovery_client,
|
| PrivetDeviceLister::Delegate* delegate);
|
|
|
| ~PrivetDeviceListerImpl() override;
|
| @@ -32,16 +35,17 @@ class PrivetDeviceListerImpl : public PrivetDeviceLister,
|
| void DiscoverNewDevices(bool force_update) override;
|
|
|
| protected:
|
| - void OnDeviceChanged(bool added,
|
| - const ServiceDescription& service_description) override;
|
| + void OnDeviceChanged(
|
| + bool added,
|
| + const local_discovery::ServiceDescription& service_description) override;
|
| void OnDeviceRemoved(const std::string& service_name) override;
|
| void OnDeviceCacheFlushed() override;
|
|
|
| private:
|
| PrivetDeviceLister::Delegate* delegate_;
|
| - ServiceDiscoveryDeviceLister device_lister_;
|
| + local_discovery::ServiceDiscoveryDeviceLister device_lister_;
|
| };
|
|
|
| -} // namespace local_discovery
|
| +} // namespace cloud_print
|
|
|
| -#endif // CHROME_BROWSER_LOCAL_DISCOVERY_PRIVET_DEVICE_LISTER_IMPL_H_
|
| +#endif // CHROME_BROWSER_PRINTING_CLOUD_PRINT_PRIVET_DEVICE_LISTER_IMPL_H_
|
|
|