diff options
| author | rsleevi@chromium.org <rsleevi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-02-06 22:56:50 +0000 |
|---|---|---|
| committer | rsleevi@chromium.org <rsleevi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-02-06 22:56:50 +0000 |
| commit | 643e0dc7cf3a242e9af0f34024e3195ac91dc33f (patch) | |
| tree | 76c90a7823ee530cd1cf673793aed9997ca4eacb /remoting/client | |
| parent | e5e77f568c6fc18da3be28ef96c6c3c33c5247f7 (diff) | |
| download | chromium_src-643e0dc7cf3a242e9af0f34024e3195ac91dc33f.zip chromium_src-643e0dc7cf3a242e9af0f34024e3195ac91dc33f.tar.gz chromium_src-643e0dc7cf3a242e9af0f34024e3195ac91dc33f.tar.bz2 | |
Linux/ChromeOS Chromium style checker cleanup, remoting/ edition.
Automated clean up of style checker errors that were missed due to the plugin
not being executed on implementation files.
BUG=115047
Review URL: https://chromiumcodereview.appspot.com/12207034
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@181075 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'remoting/client')
| -rw-r--r-- | remoting/client/audio_player_unittest.cc | 4 | ||||
| -rw-r--r-- | remoting/client/plugin/pepper_entrypoints.cc | 2 | ||||
| -rw-r--r-- | remoting/client/plugin/pepper_packet_socket_factory.cc | 20 |
3 files changed, 13 insertions, 13 deletions
diff --git a/remoting/client/audio_player_unittest.cc b/remoting/client/audio_player_unittest.cc index d68dff1..d61be0a 100644 --- a/remoting/client/audio_player_unittest.cc +++ b/remoting/client/audio_player_unittest.cc @@ -29,11 +29,11 @@ class FakeAudioPlayer : public AudioPlayer { FakeAudioPlayer() { } - bool ResetAudioPlayer(AudioPacket::SamplingRate) OVERRIDE { + virtual bool ResetAudioPlayer(AudioPacket::SamplingRate) OVERRIDE { return true; } - uint32 GetSamplesPerFrame() OVERRIDE { + virtual uint32 GetSamplesPerFrame() OVERRIDE { return kAudioSamplesPerFrame; } }; diff --git a/remoting/client/plugin/pepper_entrypoints.cc b/remoting/client/plugin/pepper_entrypoints.cc index 26f2d2e..2a367c2 100644 --- a/remoting/client/plugin/pepper_entrypoints.cc +++ b/remoting/client/plugin/pepper_entrypoints.cc @@ -27,7 +27,7 @@ namespace remoting { class ChromotingModule : public pp::Module { protected: - virtual ChromotingInstance* CreateInstance(PP_Instance instance) { + virtual ChromotingInstance* CreateInstance(PP_Instance instance) OVERRIDE { return new ChromotingInstance(instance); } }; diff --git a/remoting/client/plugin/pepper_packet_socket_factory.cc b/remoting/client/plugin/pepper_packet_socket_factory.cc index 29428ff..d7445c4 100644 --- a/remoting/client/plugin/pepper_packet_socket_factory.cc +++ b/remoting/client/plugin/pepper_packet_socket_factory.cc @@ -38,18 +38,18 @@ class UdpPacketSocket : public talk_base::AsyncPacketSocket { int max_port); // talk_base::AsyncPacketSocket interface. - virtual talk_base::SocketAddress GetLocalAddress() const; - virtual talk_base::SocketAddress GetRemoteAddress() const; - virtual int Send(const void* data, size_t data_size); + virtual talk_base::SocketAddress GetLocalAddress() const OVERRIDE; + virtual talk_base::SocketAddress GetRemoteAddress() const OVERRIDE; + virtual int Send(const void* data, size_t data_size) OVERRIDE; virtual int SendTo(const void* data, size_t data_size, - const talk_base::SocketAddress& address); - virtual int Close(); - virtual State GetState() const; - virtual int GetOption(talk_base::Socket::Option opt, int* value); - virtual int SetOption(talk_base::Socket::Option opt, int value); - virtual int GetError() const; - virtual void SetError(int error); + const talk_base::SocketAddress& address) OVERRIDE; + virtual int Close() OVERRIDE; + virtual State GetState() const OVERRIDE; + virtual int GetOption(talk_base::Socket::Option opt, int* value) OVERRIDE; + virtual int SetOption(talk_base::Socket::Option opt, int value) OVERRIDE; + virtual int GetError() const OVERRIDE; + virtual void SetError(int error) OVERRIDE; private: struct PendingPacket { |