| Index: remoting/protocol/session_config.h
|
| diff --git a/remoting/protocol/session_config.h b/remoting/protocol/session_config.h
|
| index 7ebfba6144fff6f4549958d3a612c4acdf8fd8c2..07dcaa2bd926223165d0441642d9cc76d38ae7f9 100644
|
| --- a/remoting/protocol/session_config.h
|
| +++ b/remoting/protocol/session_config.h
|
| @@ -9,6 +9,7 @@
|
| #include <vector>
|
|
|
| #include "base/basictypes.h"
|
| +#include "base/memory/scoped_ptr.h"
|
|
|
| namespace remoting {
|
| namespace protocol {
|
| @@ -119,11 +120,12 @@ class CandidateSessionConfig {
|
| // or undefined (e.g. no configurations for a channel) then NULL is returned.
|
| bool GetFinalConfig(SessionConfig* result) const;
|
|
|
| - CandidateSessionConfig* Clone() const;
|
| + scoped_ptr<CandidateSessionConfig> Clone() const;
|
|
|
| - static CandidateSessionConfig* CreateEmpty();
|
| - static CandidateSessionConfig* CreateFrom(const SessionConfig& config);
|
| - static CandidateSessionConfig* CreateDefault();
|
| + static scoped_ptr<CandidateSessionConfig> CreateEmpty();
|
| + static scoped_ptr<CandidateSessionConfig> CreateFrom(
|
| + const SessionConfig& config);
|
| + static scoped_ptr<CandidateSessionConfig> CreateDefault();
|
|
|
| private:
|
| CandidateSessionConfig();
|
|
|