| Index: chrome/browser/ui/webui/local_discovery/local_discovery_ui_handler.h
|
| diff --git a/chrome/browser/ui/webui/local_discovery/local_discovery_ui_handler.h b/chrome/browser/ui/webui/local_discovery/local_discovery_ui_handler.h
|
| index eae720906872d9afc72ba8bbc5ec83225e14c11f..fc82be817ee149597a7c28e193458cd0c27417dc 100644
|
| --- a/chrome/browser/ui/webui/local_discovery/local_discovery_ui_handler.h
|
| +++ b/chrome/browser/ui/webui/local_discovery/local_discovery_ui_handler.h
|
| @@ -48,57 +48,53 @@ class LocalDiscoveryUIHandler : public content::WebUIMessageHandler,
|
| public SigninManagerBase::Observer {
|
| public:
|
| LocalDiscoveryUIHandler();
|
| - virtual ~LocalDiscoveryUIHandler();
|
| + ~LocalDiscoveryUIHandler() override;
|
|
|
| static bool GetHasVisible();
|
|
|
| // WebUIMessageHandler implementation.
|
| - virtual void RegisterMessages() override;
|
| + void RegisterMessages() override;
|
| // PrivetRegisterOperation::Delegate implementation.
|
| - virtual void OnPrivetRegisterClaimToken(
|
| - PrivetRegisterOperation* operation,
|
| - const std::string& token,
|
| - const GURL& url) override;
|
| - virtual void OnPrivetRegisterError(
|
| - PrivetRegisterOperation* operation,
|
| - const std::string& action,
|
| - PrivetRegisterOperation::FailureReason reason,
|
| - int printer_http_code,
|
| - const base::DictionaryValue* json) override;
|
| - virtual void OnPrivetRegisterDone(
|
| - PrivetRegisterOperation* operation,
|
| - const std::string& device_id) override;
|
| + void OnPrivetRegisterClaimToken(PrivetRegisterOperation* operation,
|
| + const std::string& token,
|
| + const GURL& url) override;
|
| + void OnPrivetRegisterError(PrivetRegisterOperation* operation,
|
| + const std::string& action,
|
| + PrivetRegisterOperation::FailureReason reason,
|
| + int printer_http_code,
|
| + const base::DictionaryValue* json) override;
|
| + void OnPrivetRegisterDone(PrivetRegisterOperation* operation,
|
| + const std::string& device_id) override;
|
|
|
| // PrivetV3SetupFlow::Delegate implementation.
|
| - virtual scoped_ptr<GCDApiFlow> CreateApiFlow() override;
|
| - virtual void GetWiFiCredentials(const CredentialsCallback& callback) override;
|
| - virtual void SwitchToSetupWiFi(const ResultCallback& callback) override;
|
| - virtual void CreatePrivetV3Client(
|
| - const std::string& service_name,
|
| - const PrivetClientCallback& callback) override;
|
| - virtual void ConfirmSecurityCode(const std::string& confirmation_code,
|
| - const ResultCallback& callback) override;
|
| - virtual void RestoreWifi(const ResultCallback& callback) override;
|
| - virtual void OnSetupDone() override;
|
| - virtual void OnSetupError() override;
|
| + scoped_ptr<GCDApiFlow> CreateApiFlow() override;
|
| + void GetWiFiCredentials(const CredentialsCallback& callback) override;
|
| + void SwitchToSetupWiFi(const ResultCallback& callback) override;
|
| + void CreatePrivetV3Client(const std::string& service_name,
|
| + const PrivetClientCallback& callback) override;
|
| + void ConfirmSecurityCode(const std::string& confirmation_code,
|
| + const ResultCallback& callback) override;
|
| + void RestoreWifi(const ResultCallback& callback) override;
|
| + void OnSetupDone() override;
|
| + void OnSetupError() 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;
|
| - 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;
|
|
|
| // CloudDeviceListDelegate implementation.
|
| - virtual void OnDeviceListReady(const std::vector<Device>& devices) override;
|
| - virtual void OnDeviceListUnavailable() override;
|
| + void OnDeviceListReady(const std::vector<Device>& devices) override;
|
| + void OnDeviceListUnavailable() override;
|
|
|
| // SigninManagerBase::Observer implementation.
|
| - virtual void GoogleSigninSucceeded(const std::string& account_id,
|
| - const std::string& username,
|
| - const std::string& password) override;
|
| - virtual void GoogleSignedOut(const std::string& account_id,
|
| - const std::string& username) override;
|
| + void GoogleSigninSucceeded(const std::string& account_id,
|
| + const std::string& username,
|
| + const std::string& password) override;
|
| + void GoogleSignedOut(const std::string& account_id,
|
| + const std::string& username) override;
|
|
|
| private:
|
| typedef std::map<std::string, DeviceDescription> DeviceDescriptionMap;
|
|
|