| Index: remoting/protocol/jingle_session.h
|
| diff --git a/remoting/protocol/jingle_session.h b/remoting/protocol/jingle_session.h
|
| index c747250da52efd1f86a2a3ba6774b75b1a0c3f6a..cf1800315541621bc11eeb97886ec5dbbc856869 100644
|
| --- a/remoting/protocol/jingle_session.h
|
| +++ b/remoting/protocol/jingle_session.h
|
| @@ -43,7 +43,7 @@ class JingleSession : public Session,
|
| const StateChangeCallback& callback) OVERRIDE;
|
| virtual void SetRouteChangeCallback(
|
| const RouteChangeCallback& callback) OVERRIDE;
|
| - virtual Error error() OVERRIDE;
|
| + virtual ErrorCode error() OVERRIDE;
|
| virtual void CreateStreamChannel(
|
| const std::string& name,
|
| const StreamChannelCallback& callback) OVERRIDE;
|
| @@ -119,7 +119,7 @@ class JingleSession : public Session,
|
| // Terminates the session and sends session-terminate if it is
|
| // necessary. |error| specifies the error code in case when the
|
| // session is being closed due to an error.
|
| - void CloseInternal(Error error);
|
| + void CloseInternal(ErrorCode error);
|
|
|
| // Sets |state_| to |new_state| and calls state change callback.
|
| void SetState(State new_state);
|
| @@ -132,7 +132,7 @@ class JingleSession : public Session,
|
|
|
| std::string session_id_;
|
| State state_;
|
| - Error error_;
|
| + ErrorCode error_;
|
|
|
| SessionConfig config_;
|
| bool config_is_set_;
|
|
|