Commit 643e0dc7 authored by rsleevi@chromium.org's avatar rsleevi@chromium.org

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
parent e5e77f56
......@@ -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();
}
};
......
......@@ -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;
}
};
......
......@@ -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);
}
};
......
......@@ -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 {
......
......@@ -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;
......
......@@ -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() {}
};
......
......@@ -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_);
......
......@@ -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;
......
......@@ -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 {
......
......@@ -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(
......
......@@ -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();
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment