| Index: remoting/host/mac/me2me_preference_pane.h
|
| diff --git a/remoting/host/mac/me2me_preference_pane.h b/remoting/host/mac/me2me_preference_pane.h
|
| index da65747f9976798d9d4d240e570940979329c716..b6662403d0d21dde61e90adee2c371f2e5a74fc3 100644
|
| --- a/remoting/host/mac/me2me_preference_pane.h
|
| +++ b/remoting/host/mac/me2me_preference_pane.h
|
| @@ -6,10 +6,10 @@
|
| #import <PreferencePanes/PreferencePanes.h>
|
| #import <SecurityInterface/SFAuthorizationView.h>
|
|
|
| +#include <memory>
|
| #include <string>
|
|
|
| #include "base/macros.h"
|
| -#include "base/memory/scoped_ptr.h"
|
| #include "third_party/jsoncpp/source/include/json/value.h"
|
|
|
| namespace remoting {
|
| @@ -51,7 +51,7 @@ class JsonHostConfig {
|
|
|
| // Holds the new proposed configuration if a temporary config file is
|
| // present.
|
| - scoped_ptr<remoting::JsonHostConfig> config_;
|
| + std::unique_ptr<remoting::JsonHostConfig> config_;
|
|
|
| NSTimer* service_status_timer_;
|
|
|
|
|