| Index: remoting/protocol/channel_multiplexer.h
|
| diff --git a/remoting/protocol/channel_multiplexer.h b/remoting/protocol/channel_multiplexer.h
|
| index 506dc4b78af48af743a4676925832ff4a0325c83..99a3112495127b9911ce35088e94614f0fda3996 100644
|
| --- a/remoting/protocol/channel_multiplexer.h
|
| +++ b/remoting/protocol/channel_multiplexer.h
|
| @@ -25,8 +25,8 @@ class ChannelMultiplexer : public StreamChannelFactory {
|
|
|
| // StreamChannelFactory interface.
|
| virtual void CreateChannel(const std::string& name,
|
| - const ChannelCreatedCallback& callback) OVERRIDE;
|
| - virtual void CancelChannelCreation(const std::string& name) OVERRIDE;
|
| + const ChannelCreatedCallback& callback) override;
|
| + virtual void CancelChannelCreation(const std::string& name) override;
|
|
|
| private:
|
| struct PendingChannel;
|
|
|