summaryrefslogtreecommitdiffstats
path: root/remoting
diff options
context:
space:
mode:
authorrsleevi@chromium.org <rsleevi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-02-06 22:56:50 +0000
committerrsleevi@chromium.org <rsleevi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-02-06 22:56:50 +0000
commit643e0dc7cf3a242e9af0f34024e3195ac91dc33f (patch)
tree76c90a7823ee530cd1cf673793aed9997ca4eacb /remoting
parente5e77f568c6fc18da3be28ef96c6c3c33c5247f7 (diff)
downloadchromium_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')
-rw-r--r--remoting/base/resources_unittest.cc4
-rw-r--r--remoting/client/audio_player_unittest.cc4
-rw-r--r--remoting/client/plugin/pepper_entrypoints.cc2
-rw-r--r--remoting/client/plugin/pepper_packet_socket_factory.cc20
-rw-r--r--remoting/host/local_input_monitor_linux.cc2
-rw-r--r--remoting/host/local_input_monitor_unittest.cc2
-rw-r--r--remoting/host/plugin/host_plugin.cc2
-rw-r--r--remoting/host/policy_hack/policy_watcher_linux.cc2
-rw-r--r--remoting/jingle_glue/chromium_socket_factory.cc20
-rw-r--r--remoting/protocol/buffered_socket_writer_unittest.cc2
-rw-r--r--remoting/protocol/channel_multiplexer.cc2
11 files changed, 31 insertions, 31 deletions
diff --git a/remoting/base/resources_unittest.cc b/remoting/base/resources_unittest.cc
index 26d26b3..6d69cee 100644
--- a/remoting/base/resources_unittest.cc
+++ b/remoting/base/resources_unittest.cc
@@ -24,11 +24,11 @@ namespace remoting {
class ResourcesTest : public testing::Test {
protected:
- void SetUp() OVERRIDE {
+ virtual void SetUp() OVERRIDE {
ASSERT_TRUE(LoadResources("en-US"));
}
- void TearDown() OVERRIDE {
+ virtual void TearDown() OVERRIDE {
ui::ResourceBundle::CleanupSharedInstance();
}
};
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 {
diff --git a/remoting/host/local_input_monitor_linux.cc b/remoting/host/local_input_monitor_linux.cc
index 118e895..2821503 100644
--- a/remoting/host/local_input_monitor_linux.cc
+++ b/remoting/host/local_input_monitor_linux.cc
@@ -15,7 +15,7 @@ namespace {
class LocalInputMonitorLinux : public LocalInputMonitor {
public:
LocalInputMonitorLinux();
- ~LocalInputMonitorLinux();
+ virtual ~LocalInputMonitorLinux();
virtual void Start(MouseMoveObserver* mouse_move_observer,
const base::Closure& disconnect_callback) OVERRIDE;
diff --git a/remoting/host/local_input_monitor_unittest.cc b/remoting/host/local_input_monitor_unittest.cc
index 590765e..d33c868 100644
--- a/remoting/host/local_input_monitor_unittest.cc
+++ b/remoting/host/local_input_monitor_unittest.cc
@@ -26,7 +26,7 @@ class FakeMouseMoveObserver : public MouseMoveObserver {
virtual ~FakeMouseMoveObserver() {}
// Ignore mouse events to avoid breaking the test of someone moves the mouse.
- void OnLocalMouseMoved(const SkIPoint&) {}
+ virtual void OnLocalMouseMoved(const SkIPoint&) OVERRIDE {}
void OnDisconnectCallback() {}
};
diff --git a/remoting/host/plugin/host_plugin.cc b/remoting/host/plugin/host_plugin.cc
index 247dd06..1802702 100644
--- a/remoting/host/plugin/host_plugin.cc
+++ b/remoting/host/plugin/host_plugin.cc
@@ -76,7 +76,7 @@ class HostNPPlugin : public remoting::PluginThreadTaskRunner::Delegate {
plugin_task_runner_));
}
- ~HostNPPlugin() {
+ virtual ~HostNPPlugin() {
if (scriptable_object_) {
DCHECK_EQ(scriptable_object_->referenceCount, 1UL);
g_npnetscape_funcs->releaseobject(scriptable_object_);
diff --git a/remoting/host/policy_hack/policy_watcher_linux.cc b/remoting/host/policy_hack/policy_watcher_linux.cc
index 1dc7b21..32aac6b 100644
--- a/remoting/host/policy_hack/policy_watcher_linux.cc
+++ b/remoting/host/policy_hack/policy_watcher_linux.cc
@@ -163,7 +163,7 @@ class PolicyWatcherLinux : public PolicyWatcher {
return policy.Pass();
}
- void Reload() {
+ virtual void Reload() OVERRIDE {
DCHECK(OnPolicyWatcherThread());
// Check the directory time in order to see whether a reload is required.
base::TimeDelta delay;
diff --git a/remoting/jingle_glue/chromium_socket_factory.cc b/remoting/jingle_glue/chromium_socket_factory.cc
index 9600f47..aba0ef85 100644
--- a/remoting/jingle_glue/chromium_socket_factory.cc
+++ b/remoting/jingle_glue/chromium_socket_factory.cc
@@ -43,17 +43,17 @@ class UdpPacketSocket : public talk_base::AsyncPacketSocket {
int min_port, 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 option, int* value);
- virtual int SetOption(talk_base::Socket::Option option, 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 option, int* value) OVERRIDE;
+ virtual int SetOption(talk_base::Socket::Option option, int value) OVERRIDE;
+ virtual int GetError() const OVERRIDE;
+ virtual void SetError(int error) OVERRIDE;
private:
struct PendingPacket {
diff --git a/remoting/protocol/buffered_socket_writer_unittest.cc b/remoting/protocol/buffered_socket_writer_unittest.cc
index e0125f2..9d60971 100644
--- a/remoting/protocol/buffered_socket_writer_unittest.cc
+++ b/remoting/protocol/buffered_socket_writer_unittest.cc
@@ -44,7 +44,7 @@ class BufferedSocketWriterTest : public testing::Test {
}
protected:
- void SetUp() OVERRIDE {
+ virtual void SetUp() OVERRIDE {
socket_.reset(new FakeSocket());
writer_.reset(new BufferedSocketWriter());
writer_->Init(socket_.get(), base::Bind(
diff --git a/remoting/protocol/channel_multiplexer.cc b/remoting/protocol/channel_multiplexer.cc
index e14b2b3..b0a00da 100644
--- a/remoting/protocol/channel_multiplexer.cc
+++ b/remoting/protocol/channel_multiplexer.cc
@@ -104,7 +104,7 @@ class ChannelMultiplexer::MuxSocket : public net::StreamSocket,
public base::SupportsWeakPtr<MuxSocket> {
public:
MuxSocket(MuxChannel* channel);
- ~MuxSocket();
+ virtual ~MuxSocket();
void OnWriteComplete();
void OnWriteFailed();