diff options
25 files changed, 222 insertions, 234 deletions
diff --git a/chrome/browser/local_discovery/cloud_device_list.h b/chrome/browser/local_discovery/cloud_device_list.h index baff562..1f75efd 100644 --- a/chrome/browser/local_discovery/cloud_device_list.h +++ b/chrome/browser/local_discovery/cloud_device_list.h @@ -20,14 +20,13 @@ class CloudDeviceList : public GCDApiFlowRequest { typedef DeviceList::const_iterator iterator; explicit CloudDeviceList(CloudDeviceListDelegate* delegate); - virtual ~CloudDeviceList(); + ~CloudDeviceList() override; - virtual void OnGCDAPIFlowError(GCDApiFlow::Status status) override; + void OnGCDAPIFlowError(GCDApiFlow::Status status) override; - virtual void OnGCDAPIFlowComplete( - const base::DictionaryValue& value) override; + void OnGCDAPIFlowComplete(const base::DictionaryValue& value) override; - virtual GURL GetURL() override; + GURL GetURL() override; private: bool FillDeviceDetails(const base::DictionaryValue& value, diff --git a/chrome/browser/local_discovery/cloud_print_printer_list.h b/chrome/browser/local_discovery/cloud_print_printer_list.h index 343fa48..f4858ee 100644 --- a/chrome/browser/local_discovery/cloud_print_printer_list.h +++ b/chrome/browser/local_discovery/cloud_print_printer_list.h @@ -17,14 +17,13 @@ namespace local_discovery { class CloudPrintPrinterList : public CloudPrintApiFlowRequest { public: explicit CloudPrintPrinterList(CloudDeviceListDelegate* delegate); - virtual ~CloudPrintPrinterList(); + ~CloudPrintPrinterList() override; - virtual void OnGCDAPIFlowError(GCDApiFlow::Status status) override; + void OnGCDAPIFlowError(GCDApiFlow::Status status) override; - virtual void OnGCDAPIFlowComplete( - const base::DictionaryValue& value) override; + void OnGCDAPIFlowComplete(const base::DictionaryValue& value) override; - virtual GURL GetURL() override; + GURL GetURL() override; private: bool FillPrinterDetails(const base::DictionaryValue& printer_value, diff --git a/chrome/browser/local_discovery/gcd_api_flow.h b/chrome/browser/local_discovery/gcd_api_flow.h index 42807fd..6892a2c 100644 --- a/chrome/browser/local_discovery/gcd_api_flow.h +++ b/chrome/browser/local_discovery/gcd_api_flow.h @@ -70,11 +70,11 @@ class GCDApiFlow { class GCDApiFlowRequest : public GCDApiFlow::Request { public: GCDApiFlowRequest(); - virtual ~GCDApiFlowRequest(); + ~GCDApiFlowRequest() override; // GCDApiFlowRequest implementation - virtual std::string GetOAuthScope() override; - virtual std::vector<std::string> GetExtraRequestHeaders() override; + std::string GetOAuthScope() override; + std::vector<std::string> GetExtraRequestHeaders() override; private: DISALLOW_COPY_AND_ASSIGN(GCDApiFlowRequest); @@ -83,11 +83,11 @@ class GCDApiFlowRequest : public GCDApiFlow::Request { class CloudPrintApiFlowRequest : public GCDApiFlow::Request { public: CloudPrintApiFlowRequest(); - virtual ~CloudPrintApiFlowRequest(); + ~CloudPrintApiFlowRequest() override; // GCDApiFlowRequest implementation - virtual std::string GetOAuthScope() override; - virtual std::vector<std::string> GetExtraRequestHeaders() override; + std::string GetOAuthScope() override; + std::vector<std::string> GetExtraRequestHeaders() override; private: DISALLOW_COPY_AND_ASSIGN(CloudPrintApiFlowRequest); diff --git a/chrome/browser/local_discovery/gcd_api_flow_impl.h b/chrome/browser/local_discovery/gcd_api_flow_impl.h index f206e93..6786e23 100644 --- a/chrome/browser/local_discovery/gcd_api_flow_impl.h +++ b/chrome/browser/local_discovery/gcd_api_flow_impl.h @@ -24,19 +24,19 @@ class GCDApiFlowImpl : public GCDApiFlow, OAuth2TokenService* token_service, const std::string& account_id); - virtual ~GCDApiFlowImpl(); + ~GCDApiFlowImpl() override; - virtual void Start(scoped_ptr<Request> request) override; + void Start(scoped_ptr<Request> request) override; // net::URLFetcherDelegate implementation: - virtual void OnURLFetchComplete(const net::URLFetcher* source) override; + void OnURLFetchComplete(const net::URLFetcher* source) override; // OAuth2TokenService::Consumer implementation: - virtual void OnGetTokenSuccess(const OAuth2TokenService::Request* request, - const std::string& access_token, - const base::Time& expiration_time) override; - virtual void OnGetTokenFailure(const OAuth2TokenService::Request* request, - const GoogleServiceAuthError& error) override; + void OnGetTokenSuccess(const OAuth2TokenService::Request* request, + const std::string& access_token, + const base::Time& expiration_time) override; + void OnGetTokenFailure(const OAuth2TokenService::Request* request, + const GoogleServiceAuthError& error) override; private: void CreateRequest(const GURL& url); diff --git a/chrome/browser/local_discovery/gcd_registration_ticket_request.h b/chrome/browser/local_discovery/gcd_registration_ticket_request.h index 3956e4d..d109eb0 100644 --- a/chrome/browser/local_discovery/gcd_registration_ticket_request.h +++ b/chrome/browser/local_discovery/gcd_registration_ticket_request.h @@ -21,16 +21,15 @@ class GCDRegistrationTicketRequest : public GCDApiFlowRequest { const std::string& device_id)> ResponseCallback; explicit GCDRegistrationTicketRequest(const ResponseCallback& callback); - virtual ~GCDRegistrationTicketRequest(); + ~GCDRegistrationTicketRequest() override; // GCDApiFlowImpl::Request implementation. - virtual void GetUploadData(std::string* upload_type, - std::string* upload_data) override; - virtual net::URLFetcher::RequestType GetRequestType() override; - virtual void OnGCDAPIFlowError(GCDApiFlow::Status status) override; - virtual void OnGCDAPIFlowComplete( - const base::DictionaryValue& value) override; - virtual GURL GetURL() override; + void GetUploadData(std::string* upload_type, + std::string* upload_data) override; + net::URLFetcher::RequestType GetRequestType() override; + void OnGCDAPIFlowError(GCDApiFlow::Status status) override; + void OnGCDAPIFlowComplete(const base::DictionaryValue& value) override; + GURL GetURL() override; private: ResponseCallback callback_; diff --git a/chrome/browser/local_discovery/privet_confirm_api_flow.h b/chrome/browser/local_discovery/privet_confirm_api_flow.h index de1e8d3..5107247 100644 --- a/chrome/browser/local_discovery/privet_confirm_api_flow.h +++ b/chrome/browser/local_discovery/privet_confirm_api_flow.h @@ -22,14 +22,13 @@ class PrivetConfirmApiCallFlow : public CloudPrintApiFlowRequest { PrivetConfirmApiCallFlow(const std::string& token, const ResponseCallback& callback); - virtual ~PrivetConfirmApiCallFlow(); + ~PrivetConfirmApiCallFlow() override; - virtual void OnGCDAPIFlowError(GCDApiFlow::Status status) override; - virtual void OnGCDAPIFlowComplete( - const base::DictionaryValue& value) override; - virtual net::URLFetcher::RequestType GetRequestType() override; + void OnGCDAPIFlowError(GCDApiFlow::Status status) override; + void OnGCDAPIFlowComplete(const base::DictionaryValue& value) override; + net::URLFetcher::RequestType GetRequestType() override; - virtual GURL GetURL() override; + GURL GetURL() override; private: ResponseCallback callback_; diff --git a/chrome/browser/local_discovery/privet_device_lister_impl.h b/chrome/browser/local_discovery/privet_device_lister_impl.h index 2292718..2a41009 100644 --- a/chrome/browser/local_discovery/privet_device_lister_impl.h +++ b/chrome/browser/local_discovery/privet_device_lister_impl.h @@ -26,17 +26,16 @@ class PrivetDeviceListerImpl : public PrivetDeviceLister, ServiceDiscoveryClient* service_discovery_client, PrivetDeviceLister::Delegate* delegate); - virtual ~PrivetDeviceListerImpl(); + ~PrivetDeviceListerImpl() override; - virtual void Start() override; - virtual void DiscoverNewDevices(bool force_update) override; + void Start() override; + void DiscoverNewDevices(bool force_update) override; protected: - virtual void OnDeviceChanged( - bool added, - const ServiceDescription& service_description) override; - virtual void OnDeviceRemoved(const std::string& service_name) override; - virtual void OnDeviceCacheFlushed() override; + void OnDeviceChanged(bool added, + const ServiceDescription& service_description) override; + void OnDeviceRemoved(const std::string& service_name) override; + void OnDeviceCacheFlushed() override; private: PrivetDeviceLister::Delegate* delegate_; diff --git a/chrome/browser/local_discovery/privet_http_asynchronous_factory_mac.h b/chrome/browser/local_discovery/privet_http_asynchronous_factory_mac.h index 4d54648..ba7c96b 100644 --- a/chrome/browser/local_discovery/privet_http_asynchronous_factory_mac.h +++ b/chrome/browser/local_discovery/privet_http_asynchronous_factory_mac.h @@ -14,9 +14,9 @@ class PrivetHTTPAsynchronousFactoryMac : public PrivetHTTPAsynchronousFactory { public: explicit PrivetHTTPAsynchronousFactoryMac( net::URLRequestContextGetter* request_context); - virtual ~PrivetHTTPAsynchronousFactoryMac(); + ~PrivetHTTPAsynchronousFactoryMac() override; - virtual scoped_ptr<PrivetHTTPResolution> CreatePrivetHTTP( + scoped_ptr<PrivetHTTPResolution> CreatePrivetHTTP( const std::string& name, const net::HostPortPair& address, const ResultCallback& callback) override; @@ -28,10 +28,10 @@ class PrivetHTTPAsynchronousFactoryMac : public PrivetHTTPAsynchronousFactory { const std::string& name, const net::HostPortPair& host_port, const ResultCallback& callback); - virtual ~ResolutionMac(); + ~ResolutionMac() override; - virtual void Start() override; - virtual const std::string& GetName() override; + void Start() override; + const std::string& GetName() override; private: net::URLRequestContextGetter* request_context_; diff --git a/chrome/browser/local_discovery/privet_http_impl.h b/chrome/browser/local_discovery/privet_http_impl.h index cfcef7b..acd13c0 100644 --- a/chrome/browser/local_discovery/privet_http_impl.h +++ b/chrome/browser/local_discovery/privet_http_impl.h @@ -29,17 +29,17 @@ class PrivetInfoOperationImpl : public PrivetJSONOperation, public: PrivetInfoOperationImpl(PrivetHTTPClient* privet_client, const PrivetJSONOperation::ResultCallback& callback); - virtual ~PrivetInfoOperationImpl(); + ~PrivetInfoOperationImpl() override; - virtual void Start() override; + void Start() override; - virtual PrivetHTTPClient* GetHTTPClient() override; + PrivetHTTPClient* GetHTTPClient() override; - virtual void OnError(PrivetURLFetcher* fetcher, - PrivetURLFetcher::ErrorType error) override; - virtual void OnParsedJson(PrivetURLFetcher* fetcher, - const base::DictionaryValue& value, - bool has_error) override; + void OnError(PrivetURLFetcher* fetcher, + PrivetURLFetcher::ErrorType error) override; + void OnParsedJson(PrivetURLFetcher* fetcher, + const base::DictionaryValue& value, + bool has_error) override; private: PrivetHTTPClient* privet_client_; @@ -55,36 +55,37 @@ class PrivetRegisterOperationImpl PrivetRegisterOperationImpl(PrivetHTTPClient* privet_client, const std::string& user, PrivetRegisterOperation::Delegate* delegate); - virtual ~PrivetRegisterOperationImpl(); + ~PrivetRegisterOperationImpl() override; - virtual void Start() override; - virtual void Cancel() override; - virtual void CompleteRegistration() override; + void Start() override; + void Cancel() override; + void CompleteRegistration() override; - virtual void OnError(PrivetURLFetcher* fetcher, - PrivetURLFetcher::ErrorType error) override; + void OnError(PrivetURLFetcher* fetcher, + PrivetURLFetcher::ErrorType error) override; - virtual void OnParsedJson(PrivetURLFetcher* fetcher, - const base::DictionaryValue& value, - bool has_error) override; + void OnParsedJson(PrivetURLFetcher* fetcher, + const base::DictionaryValue& value, + bool has_error) override; - virtual void OnNeedPrivetToken( + void OnNeedPrivetToken( PrivetURLFetcher* fetcher, const PrivetURLFetcher::TokenCallback& callback) override; - virtual PrivetHTTPClient* GetHTTPClient() override; + PrivetHTTPClient* GetHTTPClient() override; + private: class Cancelation : public PrivetURLFetcher::Delegate { public: Cancelation(PrivetHTTPClient* privet_client, const std::string& user); - virtual ~Cancelation(); + ~Cancelation() override; - virtual void OnError(PrivetURLFetcher* fetcher, - PrivetURLFetcher::ErrorType error) override; + void OnError(PrivetURLFetcher* fetcher, + PrivetURLFetcher::ErrorType error) override; - virtual void OnParsedJson(PrivetURLFetcher* fetcher, - const base::DictionaryValue& value, - bool has_error) override; + void OnParsedJson(PrivetURLFetcher* fetcher, + const base::DictionaryValue& value, + bool has_error) override; void Cleanup(); @@ -126,17 +127,17 @@ class PrivetJSONOperationImpl : public PrivetJSONOperation, const std::string& path, const std::string& query_params, const PrivetJSONOperation::ResultCallback& callback); - virtual ~PrivetJSONOperationImpl(); - virtual void Start() override; + ~PrivetJSONOperationImpl() override; + void Start() override; - virtual PrivetHTTPClient* GetHTTPClient() override; + PrivetHTTPClient* GetHTTPClient() override; - virtual void OnError(PrivetURLFetcher* fetcher, - PrivetURLFetcher::ErrorType error) override; - virtual void OnParsedJson(PrivetURLFetcher* fetcher, - const base::DictionaryValue& value, - bool has_error) override; - virtual void OnNeedPrivetToken( + void OnError(PrivetURLFetcher* fetcher, + PrivetURLFetcher::ErrorType error) override; + void OnParsedJson(PrivetURLFetcher* fetcher, + const base::DictionaryValue& value, + bool has_error) override; + void OnNeedPrivetToken( PrivetURLFetcher* fetcher, const PrivetURLFetcher::TokenCallback& callback) override; @@ -157,28 +158,28 @@ class PrivetDataReadOperationImpl : public PrivetDataReadOperation, const std::string& path, const std::string& query_params, const PrivetDataReadOperation::ResultCallback& callback); - virtual ~PrivetDataReadOperationImpl(); + ~PrivetDataReadOperationImpl() override; - virtual void Start() override; + void Start() override; - virtual void SetDataRange(int range_start, int range_end) override; + void SetDataRange(int range_start, int range_end) override; - virtual void SaveDataToFile() override; + void SaveDataToFile() override; - virtual PrivetHTTPClient* GetHTTPClient() override; + PrivetHTTPClient* GetHTTPClient() override; - virtual void OnError(PrivetURLFetcher* fetcher, - PrivetURLFetcher::ErrorType error) override; - virtual void OnParsedJson(PrivetURLFetcher* fetcher, - const base::DictionaryValue& value, - bool has_error) override; - virtual void OnNeedPrivetToken( + void OnError(PrivetURLFetcher* fetcher, + PrivetURLFetcher::ErrorType error) override; + void OnParsedJson(PrivetURLFetcher* fetcher, + const base::DictionaryValue& value, + bool has_error) override; + void OnNeedPrivetToken( PrivetURLFetcher* fetcher, const PrivetURLFetcher::TokenCallback& callback) override; - virtual bool OnRawData(PrivetURLFetcher* fetcher, - bool is_file, - const std::string& data_str, - const base::FilePath& file_path) override; + bool OnRawData(PrivetURLFetcher* fetcher, + bool is_file, + const std::string& data_str, + const base::FilePath& file_path) override; private: PrivetHTTPClient* privet_client_; @@ -202,35 +203,34 @@ class PrivetLocalPrintOperationImpl PrivetLocalPrintOperationImpl(PrivetHTTPClient* privet_client, PrivetLocalPrintOperation::Delegate* delegate); - virtual ~PrivetLocalPrintOperationImpl(); - virtual void Start() override; + ~PrivetLocalPrintOperationImpl() override; + void Start() override; - virtual void SetData( - const scoped_refptr<base::RefCountedBytes>& data) override; + void SetData(const scoped_refptr<base::RefCountedBytes>& data) override; - virtual void SetCapabilities(const std::string& capabilities) override; + void SetCapabilities(const std::string& capabilities) override; - virtual void SetTicket(const std::string& ticket) override; + void SetTicket(const std::string& ticket) override; - virtual void SetUsername(const std::string& user) override; + void SetUsername(const std::string& user) override; - virtual void SetJobname(const std::string& jobname) override; + void SetJobname(const std::string& jobname) override; - virtual void SetOffline(bool offline) override; + void SetOffline(bool offline) override; - virtual void SetPageSize(const gfx::Size& page_size) override; + void SetPageSize(const gfx::Size& page_size) override; - virtual void SetPWGRasterConverterForTesting( + void SetPWGRasterConverterForTesting( scoped_ptr<PWGRasterConverter> pwg_raster_converter) override; - virtual PrivetHTTPClient* GetHTTPClient() override; + PrivetHTTPClient* GetHTTPClient() override; - virtual void OnError(PrivetURLFetcher* fetcher, - PrivetURLFetcher::ErrorType error) override; - virtual void OnParsedJson(PrivetURLFetcher* fetcher, - const base::DictionaryValue& value, - bool has_error) override; - virtual void OnNeedPrivetToken( + void OnError(PrivetURLFetcher* fetcher, + PrivetURLFetcher::ErrorType error) override; + void OnParsedJson(PrivetURLFetcher* fetcher, + const base::DictionaryValue& value, + bool has_error) override; + void OnNeedPrivetToken( PrivetURLFetcher* fetcher, const PrivetURLFetcher::TokenCallback& callback) override; @@ -292,17 +292,17 @@ class PrivetHTTPClientImpl : public PrivetHTTPClient { const std::string& name, const net::HostPortPair& host_port, net::URLRequestContextGetter* request_context); - virtual ~PrivetHTTPClientImpl(); + ~PrivetHTTPClientImpl() override; // PrivetHTTPClient implementation. - virtual const std::string& GetName() override; - virtual scoped_ptr<PrivetJSONOperation> CreateInfoOperation( + const std::string& GetName() override; + scoped_ptr<PrivetJSONOperation> CreateInfoOperation( const PrivetJSONOperation::ResultCallback& callback) override; - virtual scoped_ptr<PrivetURLFetcher> CreateURLFetcher( + scoped_ptr<PrivetURLFetcher> CreateURLFetcher( const GURL& url, net::URLFetcher::RequestType request_type, PrivetURLFetcher::Delegate* delegate) override; - virtual void RefreshPrivetToken( + void RefreshPrivetToken( const PrivetURLFetcher::TokenCallback& token_callback) override; private: @@ -323,17 +323,17 @@ class PrivetHTTPClientImpl : public PrivetHTTPClient { class PrivetV1HTTPClientImpl : public PrivetV1HTTPClient { public: explicit PrivetV1HTTPClientImpl(scoped_ptr<PrivetHTTPClient> info_client); - virtual ~PrivetV1HTTPClientImpl(); + ~PrivetV1HTTPClientImpl() override; - virtual const std::string& GetName() override; - virtual scoped_ptr<PrivetJSONOperation> CreateInfoOperation( + const std::string& GetName() override; + scoped_ptr<PrivetJSONOperation> CreateInfoOperation( const PrivetJSONOperation::ResultCallback& callback) override; - virtual scoped_ptr<PrivetRegisterOperation> CreateRegisterOperation( + scoped_ptr<PrivetRegisterOperation> CreateRegisterOperation( const std::string& user, PrivetRegisterOperation::Delegate* delegate) override; - virtual scoped_ptr<PrivetJSONOperation> CreateCapabilitiesOperation( + scoped_ptr<PrivetJSONOperation> CreateCapabilitiesOperation( const PrivetJSONOperation::ResultCallback& callback) override; - virtual scoped_ptr<PrivetLocalPrintOperation> CreateLocalPrintOperation( + scoped_ptr<PrivetLocalPrintOperation> CreateLocalPrintOperation( PrivetLocalPrintOperation::Delegate* delegate) override; private: diff --git a/chrome/browser/local_discovery/privet_http_unittest.cc b/chrome/browser/local_discovery/privet_http_unittest.cc index 44fbd24..a3f04af 100644 --- a/chrome/browser/local_discovery/privet_http_unittest.cc +++ b/chrome/browser/local_discovery/privet_http_unittest.cc @@ -762,13 +762,12 @@ class FakePWGRasterConverter : public PWGRasterConverter { FakePWGRasterConverter() { } - virtual ~FakePWGRasterConverter() { - } + ~FakePWGRasterConverter() override {} - virtual void Start(base::RefCountedMemory* data, - const printing::PdfRenderSettings& conversion_settings, - const printing::PwgRasterSettings& bitmap_settings, - const ResultCallback& callback) override { + void Start(base::RefCountedMemory* data, + const printing::PdfRenderSettings& conversion_settings, + const printing::PwgRasterSettings& bitmap_settings, + const ResultCallback& callback) override { bitmap_settings_ = bitmap_settings; std::string data_str(data->front_as<char>(), data->size()); callback.Run(true, base::FilePath().AppendASCII(data_str + "test.pdf")); diff --git a/chrome/browser/local_discovery/privet_local_printer_lister.h b/chrome/browser/local_discovery/privet_local_printer_lister.h index 037d7d1..cdb99e9 100644 --- a/chrome/browser/local_discovery/privet_local_printer_lister.h +++ b/chrome/browser/local_discovery/privet_local_printer_lister.h @@ -45,11 +45,11 @@ class PrivetLocalPrinterLister : PrivetDeviceLister::Delegate { const DeviceDescription* GetDeviceDescription(const std::string& name); // PrivetDeviceLister::Delegate implementation. - virtual void DeviceChanged(bool added, - const std::string& name, - const DeviceDescription& description) override; - virtual void DeviceRemoved(const std::string& name) override; - virtual void DeviceCacheFlushed() override; + void DeviceChanged(bool added, + const std::string& name, + const DeviceDescription& description) override; + void DeviceRemoved(const std::string& name) override; + void DeviceCacheFlushed() override; private: struct DeviceContext; diff --git a/chrome/browser/local_discovery/privet_notifications.h b/chrome/browser/local_discovery/privet_notifications.h index aae7cdd..f71f71b 100644 --- a/chrome/browser/local_discovery/privet_notifications.h +++ b/chrome/browser/local_discovery/privet_notifications.h @@ -95,18 +95,19 @@ class PrivetNotificationService public base::SupportsWeakPtr<PrivetNotificationService> { public: explicit PrivetNotificationService(content::BrowserContext* profile); - virtual ~PrivetNotificationService(); + ~PrivetNotificationService() override; // PrivetDeviceLister::Delegate implementation: - virtual void DeviceChanged(bool added, const std::string& name, - const DeviceDescription& description) override; - virtual void DeviceRemoved(const std::string& name) override; + void DeviceChanged(bool added, + const std::string& name, + const DeviceDescription& description) override; + void DeviceRemoved(const std::string& name) override; // PrivetNotificationListener::Delegate implementation: - virtual void PrivetNotify(bool has_multiple, bool added) override; + void PrivetNotify(bool has_multiple, bool added) override; - virtual void PrivetRemoveNotification() override; - virtual void DeviceCacheFlushed() override; + void PrivetRemoveNotification() override; + void DeviceCacheFlushed() override; static bool IsEnabled(); static bool IsForced(); @@ -132,18 +133,18 @@ class PrivetNotificationDelegate : public NotificationDelegate { explicit PrivetNotificationDelegate(content::BrowserContext* profile); // NotificationDelegate implementation. - virtual std::string id() const override; - virtual void Display() override; - virtual void Error() override; - virtual void Close(bool by_user) override; - virtual void Click() override; - virtual void ButtonClick(int button_index) override; + std::string id() const override; + void Display() override; + void Error() override; + void Close(bool by_user) override; + void Click() override; + void ButtonClick(int button_index) override; private: void OpenTab(const GURL& url); void DisableNotifications(); - virtual ~PrivetNotificationDelegate(); + ~PrivetNotificationDelegate() override; content::BrowserContext* profile_; }; diff --git a/chrome/browser/local_discovery/privet_notifications_factory.h b/chrome/browser/local_discovery/privet_notifications_factory.h index b6d62d3..5946a37 100644 --- a/chrome/browser/local_discovery/privet_notifications_factory.h +++ b/chrome/browser/local_discovery/privet_notifications_factory.h @@ -20,13 +20,13 @@ class PrivetNotificationServiceFactory friend struct DefaultSingletonTraits<PrivetNotificationServiceFactory>; PrivetNotificationServiceFactory(); - virtual ~PrivetNotificationServiceFactory(); + ~PrivetNotificationServiceFactory() override; // BrowserContextKeyedServiceFactory: - virtual KeyedService* BuildServiceInstanceFor( + KeyedService* BuildServiceInstanceFor( content::BrowserContext* profile) const override; - virtual bool ServiceIsCreatedWithBrowserContext() const override; - virtual bool ServiceIsNULLWhileTesting() const override; + bool ServiceIsCreatedWithBrowserContext() const override; + bool ServiceIsNULLWhileTesting() const override; }; } // namespace local_discovery diff --git a/chrome/browser/local_discovery/privet_url_fetcher.h b/chrome/browser/local_discovery/privet_url_fetcher.h index 8bae4a7..e8644bd 100644 --- a/chrome/browser/local_discovery/privet_url_fetcher.h +++ b/chrome/browser/local_discovery/privet_url_fetcher.h @@ -71,10 +71,10 @@ class PrivetURLFetcher : public net::URLFetcherDelegate { net::URLRequestContextGetter* request_context, Delegate* delegate); - virtual ~PrivetURLFetcher(); + ~PrivetURLFetcher() override; // net::URLFetcherDelegate methods. - virtual void OnURLFetchComplete(const net::URLFetcher* source) override; + void OnURLFetchComplete(const net::URLFetcher* source) override; static void SetTokenForHost(const std::string& host, const std::string& token); diff --git a/chrome/browser/local_discovery/privetv3_crypto_provider.cc b/chrome/browser/local_discovery/privetv3_crypto_provider.cc index 12bbcc8..819df06 100644 --- a/chrome/browser/local_discovery/privetv3_crypto_provider.cc +++ b/chrome/browser/local_discovery/privetv3_crypto_provider.cc @@ -20,19 +20,18 @@ const char kStubVerificationCode[] = "SAMPLE"; class PrivetV3CryptoProviderEmpty : public PrivetV3CryptoProvider { public: PrivetV3CryptoProviderEmpty(); - virtual ~PrivetV3CryptoProviderEmpty(); + ~PrivetV3CryptoProviderEmpty() override; // PrivetV3CryptoProvider implementation. - virtual HandshakeState GetState() override; - virtual std::string GetAuthMethod() override; - virtual HandshakeState GetNextStep(int* step, std::string* package) override; - virtual HandshakeState SetStepResponse(int step, - const std::string& state, - const std::string& package) override; - virtual std::string GetVerificationCode() override; - virtual HandshakeState AcceptVerificationCode() override; - virtual bool EncryptData(const std::string& input, - std::string* output) override; + HandshakeState GetState() override; + std::string GetAuthMethod() override; + HandshakeState GetNextStep(int* step, std::string* package) override; + HandshakeState SetStepResponse(int step, + const std::string& state, + const std::string& package) override; + std::string GetVerificationCode() override; + HandshakeState AcceptVerificationCode() override; + bool EncryptData(const std::string& input, std::string* output) override; private: HandshakeState state_; diff --git a/chrome/browser/local_discovery/privetv3_session.cc b/chrome/browser/local_discovery/privetv3_session.cc index cb619a9..ceee47c 100644 --- a/chrome/browser/local_discovery/privetv3_session.cc +++ b/chrome/browser/local_discovery/privetv3_session.cc @@ -31,17 +31,17 @@ class PrivetV3Session::FetcherDelegate : public PrivetURLFetcher::Delegate { public: FetcherDelegate(const base::WeakPtr<PrivetV3Session>& session, Request* request); - virtual ~FetcherDelegate(); + ~FetcherDelegate() override; // PrivetURLFetcher::Delegate methods. - virtual void OnNeedPrivetToken( + void OnNeedPrivetToken( PrivetURLFetcher* fetcher, const PrivetURLFetcher::TokenCallback& callback) override; - virtual void OnError(PrivetURLFetcher* fetcher, - PrivetURLFetcher::ErrorType error) override; - virtual void OnParsedJson(PrivetURLFetcher* fetcher, - const base::DictionaryValue& value, - bool has_error) override; + void OnError(PrivetURLFetcher* fetcher, + PrivetURLFetcher::ErrorType error) override; + void OnParsedJson(PrivetURLFetcher* fetcher, + const base::DictionaryValue& value, + bool has_error) override; private: friend class PrivetV3Session; diff --git a/chrome/browser/local_discovery/privetv3_setup_flow.cc b/chrome/browser/local_discovery/privetv3_setup_flow.cc index 8750128..e122e8f 100644 --- a/chrome/browser/local_discovery/privetv3_setup_flow.cc +++ b/chrome/browser/local_discovery/privetv3_setup_flow.cc @@ -19,14 +19,14 @@ const char kUserJsonKeyName[] = "registration.user"; class SetupRequest : public PrivetV3Session::Request { public: explicit SetupRequest(PrivetV3SetupFlow* setup_flow); - virtual ~SetupRequest(); + ~SetupRequest() override; - virtual std::string GetName() override { return "/privet/v3/setup/start"; } - virtual const base::DictionaryValue& GetInput() override; + std::string GetName() override { return "/privet/v3/setup/start"; } + const base::DictionaryValue& GetInput() override; - virtual void OnError() override; - virtual void OnParsedJson(const base::DictionaryValue& value, - bool has_error) override; + void OnError() override; + void OnParsedJson(const base::DictionaryValue& value, + bool has_error) override; void SetWiFiCridentials(const std::string& ssid, const std::string& password); diff --git a/chrome/browser/local_discovery/privetv3_setup_flow.h b/chrome/browser/local_discovery/privetv3_setup_flow.h index 925ee8a..3395968 100644 --- a/chrome/browser/local_discovery/privetv3_setup_flow.h +++ b/chrome/browser/local_discovery/privetv3_setup_flow.h @@ -62,7 +62,7 @@ class PrivetV3SetupFlow : public PrivetV3Session::Delegate { }; explicit PrivetV3SetupFlow(Delegate* delegate); - virtual ~PrivetV3SetupFlow(); + ~PrivetV3SetupFlow() override; // Starts registration. void Register(const std::string& service_name); @@ -72,12 +72,10 @@ class PrivetV3SetupFlow : public PrivetV3Session::Delegate { #endif // ENABLE_WIFI_BOOTSTRAPPING // PrivetV3Session::Delegate implementation. - virtual void OnSetupConfirmationNeeded( - const std::string& confirmation_code, - extensions::api::gcd_private::ConfirmationType confirmation_type) - override; - virtual void OnSessionStatus( - extensions::api::gcd_private::Status status) override; + void OnSetupConfirmationNeeded(const std::string& confirmation_code, + extensions::api::gcd_private::ConfirmationType + confirmation_type) override; + void OnSessionStatus(extensions::api::gcd_private::Status status) override; void OnSetupError(); void OnDeviceRegistered(); diff --git a/chrome/browser/local_discovery/privetv3_setup_flow_unittest.cc b/chrome/browser/local_discovery/privetv3_setup_flow_unittest.cc index 5cf3e28..89ac398 100644 --- a/chrome/browser/local_discovery/privetv3_setup_flow_unittest.cc +++ b/chrome/browser/local_discovery/privetv3_setup_flow_unittest.cc @@ -75,7 +75,7 @@ class MockDelegate : public PrivetV3SetupFlow::Delegate { public: explicit MockGCDApiFlow(MockDelegate* delegate) : delegate_(delegate) {} - virtual void Start(scoped_ptr<Request> request) override { + void Start(scoped_ptr<Request> request) override { ASSERT_FALSE(delegate_->gcd_request_); delegate_->gcd_request_ = request.Pass(); delegate_->ReplyWithToken(); diff --git a/chrome/browser/local_discovery/pwg_raster_converter.cc b/chrome/browser/local_discovery/pwg_raster_converter.cc index 75b6756..40f3b0e 100644 --- a/chrome/browser/local_discovery/pwg_raster_converter.cc +++ b/chrome/browser/local_discovery/pwg_raster_converter.cc @@ -109,11 +109,11 @@ class PwgUtilityProcessHostClient : public content::UtilityProcessHostClient { const PWGRasterConverter::ResultCallback& callback); // UtilityProcessHostClient implementation. - virtual void OnProcessCrashed(int exit_code) override; - virtual bool OnMessageReceived(const IPC::Message& message) override; + void OnProcessCrashed(int exit_code) override; + bool OnMessageReceived(const IPC::Message& message) override; private: - virtual ~PwgUtilityProcessHostClient(); + ~PwgUtilityProcessHostClient() override; // Message handlers. void OnProcessStarted(); @@ -243,12 +243,12 @@ class PWGRasterConverterImpl : public PWGRasterConverter { public: PWGRasterConverterImpl(); - virtual ~PWGRasterConverterImpl(); + ~PWGRasterConverterImpl() override; - virtual void Start(base::RefCountedMemory* data, - const printing::PdfRenderSettings& conversion_settings, - const printing::PwgRasterSettings& bitmap_settings, - const ResultCallback& callback) override; + void Start(base::RefCountedMemory* data, + const printing::PdfRenderSettings& conversion_settings, + const printing::PwgRasterSettings& bitmap_settings, + const ResultCallback& callback) override; private: scoped_refptr<PwgUtilityProcessHostClient> utility_client_; diff --git a/chrome/browser/local_discovery/service_discovery_client_mac.h b/chrome/browser/local_discovery/service_discovery_client_mac.h index bc67de4..17f19cf5 100644 --- a/chrome/browser/local_discovery/service_discovery_client_mac.h +++ b/chrome/browser/local_discovery/service_discovery_client_mac.h @@ -32,16 +32,16 @@ class ServiceDiscoveryClientMac : public ServiceDiscoverySharedClient { ServiceDiscoveryClientMac(); private: - virtual ~ServiceDiscoveryClientMac(); + ~ServiceDiscoveryClientMac() override; // ServiceDiscoveryClient implementation. - virtual scoped_ptr<ServiceWatcher> CreateServiceWatcher( + scoped_ptr<ServiceWatcher> CreateServiceWatcher( const std::string& service_type, const ServiceWatcher::UpdatedCallback& callback) override; - virtual scoped_ptr<ServiceResolver> CreateServiceResolver( + scoped_ptr<ServiceResolver> CreateServiceResolver( const std::string& service_name, const ServiceResolver::ResolveCompleteCallback& callback) override; - virtual scoped_ptr<LocalDomainResolver> CreateLocalDomainResolver( + scoped_ptr<LocalDomainResolver> CreateLocalDomainResolver( const std::string& domain, net::AddressFamily address_family, const LocalDomainResolver::IPAddressCallback& callback) override; @@ -100,13 +100,12 @@ class ServiceWatcherImplMac : public ServiceWatcher { const std::string& service); private: - virtual ~ServiceWatcherImplMac(); + ~ServiceWatcherImplMac() override; - virtual void Start() override; - virtual void DiscoverNewServices(bool force_update) override; - virtual void SetActivelyRefreshServices( - bool actively_refresh_services) override; - virtual std::string GetServiceType() const override; + void Start() override; + void DiscoverNewServices(bool force_update) override; + void SetActivelyRefreshServices(bool actively_refresh_services) override; + std::string GetServiceType() const override; std::string service_type_; ServiceWatcher::UpdatedCallback callback_; @@ -168,10 +167,10 @@ class ServiceResolverImplMac : public ServiceResolver { NetServiceContainer* GetContainerForTesting(); private: - virtual ~ServiceResolverImplMac(); + ~ServiceResolverImplMac() override; - virtual void StartResolving() override; - virtual std::string GetName() const override; + void StartResolving() override; + std::string GetName() const override; void OnResolveComplete(RequestStatus status, const ServiceDescription& description); diff --git a/chrome/browser/local_discovery/service_discovery_shared_client.h b/chrome/browser/local_discovery/service_discovery_shared_client.h index 14dd12f..c0b7d41 100644 --- a/chrome/browser/local_discovery/service_discovery_shared_client.h +++ b/chrome/browser/local_discovery/service_discovery_shared_client.h @@ -21,7 +21,7 @@ class ServiceDiscoverySharedClient protected: ServiceDiscoverySharedClient(); - virtual ~ServiceDiscoverySharedClient(); + ~ServiceDiscoverySharedClient() override; private: friend class base::RefCounted<ServiceDiscoverySharedClient>; diff --git a/chrome/browser/local_discovery/wifi/bootstrapping_device_lister.h b/chrome/browser/local_discovery/wifi/bootstrapping_device_lister.h index 5c2dd28..c2ca45e 100644 --- a/chrome/browser/local_discovery/wifi/bootstrapping_device_lister.h +++ b/chrome/browser/local_discovery/wifi/bootstrapping_device_lister.h @@ -42,7 +42,7 @@ class BootstrappingDeviceLister : public NetworkListObserver { BootstrappingDeviceLister(WifiManager* wifi_manager, const UpdateCallback& update_callback); - virtual ~BootstrappingDeviceLister(); + ~BootstrappingDeviceLister() override; void Start(); @@ -51,7 +51,7 @@ class BootstrappingDeviceLister : public NetworkListObserver { std::pair<std::string /*ssid*/, std::string /*internal_name*/> > ActiveDeviceList; - virtual void OnNetworkListChanged( + void OnNetworkListChanged( const std::vector<NetworkProperties>& ssids) override; void UpdateChangedSSIDs(bool available, diff --git a/chrome/browser/local_discovery/wifi/wifi_manager_nonchromeos.cc b/chrome/browser/local_discovery/wifi/wifi_manager_nonchromeos.cc index 8077c3a..88620d3 100644 --- a/chrome/browser/local_discovery/wifi/wifi_manager_nonchromeos.cc +++ b/chrome/browser/local_discovery/wifi/wifi_manager_nonchromeos.cc @@ -55,7 +55,7 @@ class WifiManagerNonChromeos::WifiServiceWrapper explicit WifiServiceWrapper( base::WeakPtr<WifiManagerNonChromeos> wifi_manager); - virtual ~WifiServiceWrapper(); + ~WifiServiceWrapper() override; void Start(); @@ -79,7 +79,7 @@ class WifiManagerNonChromeos::WifiServiceWrapper private: // net::NetworkChangeNotifier::NetworkChangeObserver implementation. - virtual void OnNetworkChanged( + void OnNetworkChanged( net::NetworkChangeNotifier::ConnectionType type) override; void GetSSIDListInternal(NetworkPropertiesList* ssid_list); diff --git a/chrome/browser/local_discovery/wifi/wifi_manager_nonchromeos.h b/chrome/browser/local_discovery/wifi/wifi_manager_nonchromeos.h index 61b9d6b..20d432f 100644 --- a/chrome/browser/local_discovery/wifi/wifi_manager_nonchromeos.h +++ b/chrome/browser/local_discovery/wifi/wifi_manager_nonchromeos.h @@ -22,24 +22,21 @@ namespace wifi { class WifiManagerNonChromeos : public WifiManager { public: WifiManagerNonChromeos(); - virtual ~WifiManagerNonChromeos(); + ~WifiManagerNonChromeos() override; // WifiManager implementation. - virtual void Start() override; - virtual void GetSSIDList(const SSIDListCallback& callback) override; - virtual void RequestScan() override; - virtual void ConfigureAndConnectNetwork( - const std::string& ssid, - const WifiCredentials& credentials, - const SuccessCallback& callback) override; - virtual void ConnectToNetworkByID(const std::string& internal_id, - const SuccessCallback& callback) override; - virtual void RequestNetworkCredentials( - const std::string& ssid, - const CredentialsCallback& callback) override; - virtual void AddNetworkListObserver(NetworkListObserver* observer) override; - virtual void RemoveNetworkListObserver( - NetworkListObserver* observer) override; + void Start() override; + void GetSSIDList(const SSIDListCallback& callback) override; + void RequestScan() override; + void ConfigureAndConnectNetwork(const std::string& ssid, + const WifiCredentials& credentials, + const SuccessCallback& callback) override; + void ConnectToNetworkByID(const std::string& internal_id, + const SuccessCallback& callback) override; + void RequestNetworkCredentials(const std::string& ssid, + const CredentialsCallback& callback) override; + void AddNetworkListObserver(NetworkListObserver* observer) override; + void RemoveNetworkListObserver(NetworkListObserver* observer) override; private: class WifiServiceWrapper; |