| Index: remoting/host/setup/daemon_controller_delegate_mac.h
|
| diff --git a/remoting/host/setup/daemon_controller_delegate_mac.h b/remoting/host/setup/daemon_controller_delegate_mac.h
|
| index 8a881d91801ddad77f31b3591a333d87901623f5..ec69d32c5aa953c029069265fbc2b4bb9988f7a6 100644
|
| --- a/remoting/host/setup/daemon_controller_delegate_mac.h
|
| +++ b/remoting/host/setup/daemon_controller_delegate_mac.h
|
| @@ -14,24 +14,22 @@ namespace remoting {
|
| class DaemonControllerDelegateMac : public DaemonController::Delegate {
|
| public:
|
| DaemonControllerDelegateMac();
|
| - virtual ~DaemonControllerDelegateMac();
|
| + ~DaemonControllerDelegateMac() override;
|
|
|
| // DaemonController::Delegate interface.
|
| - virtual DaemonController::State GetState() override;
|
| - virtual scoped_ptr<base::DictionaryValue> GetConfig() override;
|
| - virtual void InstallHost(
|
| - const DaemonController::CompletionCallback& done) override;
|
| - virtual void SetConfigAndStart(
|
| + DaemonController::State GetState() override;
|
| + scoped_ptr<base::DictionaryValue> GetConfig() override;
|
| + void InstallHost(const DaemonController::CompletionCallback& done) override;
|
| + void SetConfigAndStart(
|
| scoped_ptr<base::DictionaryValue> config,
|
| bool consent,
|
| const DaemonController::CompletionCallback& done) override;
|
| - virtual void UpdateConfig(
|
| - scoped_ptr<base::DictionaryValue> config,
|
| - const DaemonController::CompletionCallback& done) override;
|
| - virtual void Stop(const DaemonController::CompletionCallback& done) override;
|
| - virtual void SetWindow(void* window_handle) override;
|
| - virtual std::string GetVersion() override;
|
| - virtual DaemonController::UsageStatsConsent GetUsageStatsConsent() override;
|
| + void UpdateConfig(scoped_ptr<base::DictionaryValue> config,
|
| + const DaemonController::CompletionCallback& done) override;
|
| + void Stop(const DaemonController::CompletionCallback& done) override;
|
| + void SetWindow(void* window_handle) override;
|
| + std::string GetVersion() override;
|
| + DaemonController::UsageStatsConsent GetUsageStatsConsent() override;
|
|
|
| private:
|
| void ShowPreferencePane(const std::string& config_data,
|
|
|