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

Unified Diff: net/dns/mdns_client_impl.h

Issue 669813003: Update from chromium https://crrev.com/301725/ (Closed) Base URL: git@github.com:domokit/mojo.git@master
Patch Set: Created 6 years, 2 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 | « net/dns/host_resolver_impl_unittest.cc ('k') | net/dns/mdns_client_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: net/dns/mdns_client_impl.h
diff --git a/net/dns/mdns_client_impl.h b/net/dns/mdns_client_impl.h
index b6f8b934c9352ee9066a6586379dee9f37138a04..0dfedf9e87e5a7582a289ee0385f7c722ec53604 100644
--- a/net/dns/mdns_client_impl.h
+++ b/net/dns/mdns_client_impl.h
@@ -26,10 +26,9 @@ namespace net {
class MDnsSocketFactoryImpl : public MDnsSocketFactory {
public:
MDnsSocketFactoryImpl() {};
- virtual ~MDnsSocketFactoryImpl() {};
+ ~MDnsSocketFactoryImpl() override{};
- virtual void CreateSockets(
- ScopedVector<DatagramServerSocket>* sockets) override;
+ void CreateSockets(ScopedVector<DatagramServerSocket>* sockets) override;
private:
DISALLOW_COPY_AND_ASSIGN(MDnsSocketFactoryImpl);
@@ -111,7 +110,7 @@ class NET_EXPORT_PRIVATE MDnsClientImpl : public MDnsClient {
class Core : public base::SupportsWeakPtr<Core>, MDnsConnection::Delegate {
public:
explicit Core(MDnsClientImpl* client);
- virtual ~Core();
+ ~Core() override;
// Initialize the core. Returns true on success.
bool Init(MDnsSocketFactory* socket_factory);
@@ -128,9 +127,9 @@ class NET_EXPORT_PRIVATE MDnsClientImpl : public MDnsClient {
std::vector<const RecordParsed*>* records) const;
// Parse the response and alert relevant listeners.
- virtual void HandlePacket(DnsResponse* response, int bytes_read) override;
+ void HandlePacket(DnsResponse* response, int bytes_read) override;
- virtual void OnConnectionError(int error) override;
+ void OnConnectionError(int error) override;
private:
typedef std::pair<std::string, uint16> ListenerKey;
@@ -170,23 +169,23 @@ class NET_EXPORT_PRIVATE MDnsClientImpl : public MDnsClient {
};
MDnsClientImpl();
- virtual ~MDnsClientImpl();
+ ~MDnsClientImpl() override;
// MDnsClient implementation:
- virtual scoped_ptr<MDnsListener> CreateListener(
+ scoped_ptr<MDnsListener> CreateListener(
uint16 rrtype,
const std::string& name,
MDnsListener::Delegate* delegate) override;
- virtual scoped_ptr<MDnsTransaction> CreateTransaction(
+ scoped_ptr<MDnsTransaction> CreateTransaction(
uint16 rrtype,
const std::string& name,
int flags,
const MDnsTransaction::ResultCallback& callback) override;
- virtual bool StartListening(MDnsSocketFactory* socket_factory) override;
- virtual void StopListening() override;
- virtual bool IsListening() const override;
+ bool StartListening(MDnsSocketFactory* socket_factory) override;
+ void StopListening() override;
+ bool IsListening() const override;
Core* core() { return core_.get(); }
@@ -204,17 +203,17 @@ class MDnsListenerImpl : public MDnsListener,
MDnsListener::Delegate* delegate,
MDnsClientImpl* client);
- virtual ~MDnsListenerImpl();
+ ~MDnsListenerImpl() override;
// MDnsListener implementation:
- virtual bool Start() override;
+ bool Start() override;
// Actively refresh any received records.
- virtual void SetActiveRefresh(bool active_refresh) override;
+ void SetActiveRefresh(bool active_refresh) override;
- virtual const std::string& GetName() const override;
+ const std::string& GetName() const override;
- virtual uint16 GetType() const override;
+ uint16 GetType() const override;
MDnsListener::Delegate* delegate() { return delegate_; }
@@ -252,20 +251,20 @@ class MDnsTransactionImpl : public base::SupportsWeakPtr<MDnsTransactionImpl>,
int flags,
const MDnsTransaction::ResultCallback& callback,
MDnsClientImpl* client);
- virtual ~MDnsTransactionImpl();
+ ~MDnsTransactionImpl() override;
// MDnsTransaction implementation:
- virtual bool Start() override;
+ bool Start() override;
- virtual const std::string& GetName() const override;
- virtual uint16 GetType() const override;
+ const std::string& GetName() const override;
+ uint16 GetType() const override;
// MDnsListener::Delegate implementation:
- virtual void OnRecordUpdate(MDnsListener::UpdateType update,
- const RecordParsed* record) override;
- virtual void OnNsecRecord(const std::string& name, unsigned type) override;
+ void OnRecordUpdate(MDnsListener::UpdateType update,
+ const RecordParsed* record) override;
+ void OnNsecRecord(const std::string& name, unsigned type) override;
- virtual void OnCachePurged() override;
+ void OnCachePurged() override;
private:
bool is_active() { return !callback_.is_null(); }
« no previous file with comments | « net/dns/host_resolver_impl_unittest.cc ('k') | net/dns/mdns_client_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698