0

Chromium style checker cleanup

Automated clean up of style checker errors that were missed due to the plugin
not being executed on implementation files.

BUG=115047
TBR=ben, brettw, jamesr, joi, satorux, piman, wez

Review URL: https://chromiumcodereview.appspot.com/12813004

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@188311 0039d316-1c4b-4281-b951-d872f2087c98
This commit is contained in:
rsleevi@chromium.org
2013-03-15 09:12:48 +00:00
parent 72c42175d2
commit aa3174b125
46 changed files with 102 additions and 89 deletions
ash/shelf
cc
chrome
chromeos/network/onc
components/autofill/browser
content
gpu/command_buffer/service
net/quic
remoting/host
ui
compositor
message_center
webkit

@ -69,21 +69,21 @@ class ShelfWidget::DelegateView : public views::WidgetDelegate,
bool GetDimmed() const { return dimmed_; } bool GetDimmed() const { return dimmed_; }
// views::View overrides: // views::View overrides:
void OnPaintBackground(gfx::Canvas* canvas) OVERRIDE; virtual void OnPaintBackground(gfx::Canvas* canvas) OVERRIDE;
// views::WidgetDelegateView overrides: // views::WidgetDelegateView overrides:
views::Widget* GetWidget() OVERRIDE { virtual views::Widget* GetWidget() OVERRIDE {
return View::GetWidget(); return View::GetWidget();
} }
const views::Widget* GetWidget() const OVERRIDE { virtual const views::Widget* GetWidget() const OVERRIDE {
return View::GetWidget(); return View::GetWidget();
} }
bool CanActivate() const OVERRIDE; virtual bool CanActivate() const OVERRIDE;
void Layout() OVERRIDE; virtual void Layout() OVERRIDE;
// BackgroundAnimatorDelegate overrides: // BackgroundAnimatorDelegate overrides:
void UpdateBackground(int alpha) OVERRIDE; virtual void UpdateBackground(int alpha) OVERRIDE;
private: private:
ShelfWidget* shelf_; ShelfWidget* shelf_;

@ -243,7 +243,7 @@ class LayerTreeHostDelegatedTestLayerUsesFrameDamage
virtual bool prepareToDrawOnThread(LayerTreeHostImpl* host_impl, virtual bool prepareToDrawOnThread(LayerTreeHostImpl* host_impl,
LayerTreeHostImpl::FrameData* frame, LayerTreeHostImpl::FrameData* frame,
bool result) { bool result) OVERRIDE {
EXPECT_TRUE(result); EXPECT_TRUE(result);
if (!first_draw_for_source_frame_) if (!first_draw_for_source_frame_)

@ -136,7 +136,7 @@ class MockCanvas : public SkCanvas {
public: public:
explicit MockCanvas(SkDevice* device) : SkCanvas(device) {} explicit MockCanvas(SkDevice* device) : SkCanvas(device) {}
virtual void drawRect(const SkRect& rect, const SkPaint& paint) { virtual void drawRect(const SkRect& rect, const SkPaint& paint) OVERRIDE {
// Capture calls before SkCanvas quickReject kicks in // Capture calls before SkCanvas quickReject kicks in
rects_.push_back(rect); rects_.push_back(rect);
} }

@ -16,7 +16,7 @@ class FakeInfinitePicturePileImpl : public PicturePileImpl {
} }
protected: protected:
~FakeInfinitePicturePileImpl() {} virtual ~FakeInfinitePicturePileImpl() {}
}; };
FakePictureLayerTilingClient::FakePictureLayerTilingClient() FakePictureLayerTilingClient::FakePictureLayerTilingClient()

@ -67,7 +67,7 @@ class WorkerPool::Inner : public base::DelegateSimpleThread::Delegate {
size_t num_threads, size_t num_threads,
const std::string& thread_name_prefix, const std::string& thread_name_prefix,
bool need_on_task_completed_callback); bool need_on_task_completed_callback);
~Inner(); virtual ~Inner();
void Shutdown(); void Shutdown();

@ -72,7 +72,7 @@ class TestAutofillExternalDelegate : public AutofillExternalDelegate {
TestAutofillExternalDelegate(content::WebContents* web_contents, TestAutofillExternalDelegate(content::WebContents* web_contents,
AutofillManager* autofill_manager) AutofillManager* autofill_manager)
: AutofillExternalDelegate(web_contents, autofill_manager) {} : AutofillExternalDelegate(web_contents, autofill_manager) {}
~TestAutofillExternalDelegate() {} virtual ~TestAutofillExternalDelegate() {}
}; };
} // namespace } // namespace

@ -169,7 +169,7 @@ class SuspendStateDelegateImpl
} }
// chromeos::SessionManagerClient::Observer implementation. // chromeos::SessionManagerClient::Observer implementation.
virtual void ScreenIsUnlocked() { virtual void ScreenIsUnlocked() OVERRIDE {
is_resuming_ = true; is_resuming_ = true;
// Undo any previous resets. // Undo any previous resets.
weak_factory_.InvalidateWeakPtrs(); weak_factory_.InvalidateWeakPtrs();

@ -13,10 +13,10 @@ namespace input_method {
class InputMethodConfigurationTest : public testing::Test { class InputMethodConfigurationTest : public testing::Test {
public: public:
void SetUp() { virtual void SetUp() {
} }
void TearDown() { virtual void TearDown() {
} }
}; };

@ -305,7 +305,7 @@ class ImeObserver : public chromeos::InputMethodEngine::Observer {
virtual void OnSurroundingTextChanged(const std::string& engine_id, virtual void OnSurroundingTextChanged(const std::string& engine_id,
const std::string& text, const std::string& text,
int cursor_pos, int cursor_pos,
int anchor_pos) { int anchor_pos) OVERRIDE {
if (profile_ == NULL || extension_id_.empty()) if (profile_ == NULL || extension_id_.empty())
return; return;
DictionaryValue* dict = new DictionaryValue(); DictionaryValue* dict = new DictionaryValue();

@ -37,7 +37,7 @@ class PushMessagingCanaryTest : public ExtensionApiTest {
sync_setup_helper_.reset(new SyncSetupHelper()); sync_setup_helper_.reset(new SyncSetupHelper());
} }
~PushMessagingCanaryTest() { virtual ~PushMessagingCanaryTest() {
} }
virtual void SetUp() OVERRIDE { virtual void SetUp() OVERRIDE {

@ -121,7 +121,7 @@ class ExtensionCrashRecoveryTestBase : public ExtensionBrowserTest {
class MessageCenterExtensionCrashRecoveryTest class MessageCenterExtensionCrashRecoveryTest
: public ExtensionCrashRecoveryTestBase { : public ExtensionCrashRecoveryTestBase {
protected: protected:
virtual void AcceptNotification(size_t index) { virtual void AcceptNotification(size_t index) OVERRIDE {
message_center::MessageCenter* message_center = message_center::MessageCenter* message_center =
message_center::MessageCenter::Get(); message_center::MessageCenter::Get();
ASSERT_GT(message_center->NotificationCount(), index); ASSERT_GT(message_center->NotificationCount(), index);
@ -134,7 +134,7 @@ class MessageCenterExtensionCrashRecoveryTest
WaitForExtensionLoad(); WaitForExtensionLoad();
} }
virtual void CancelNotification(size_t index) { virtual void CancelNotification(size_t index) OVERRIDE {
message_center::MessageCenter* message_center = message_center::MessageCenter* message_center =
message_center::MessageCenter::Get(); message_center::MessageCenter::Get();
ASSERT_GT(message_center->NotificationCount(), index); ASSERT_GT(message_center->NotificationCount(), index);
@ -145,7 +145,7 @@ class MessageCenterExtensionCrashRecoveryTest
g_browser_process->notification_ui_manager()->CancelById((*it)->id())); g_browser_process->notification_ui_manager()->CancelById((*it)->id()));
} }
virtual size_t CountBalloons() { virtual size_t CountBalloons() OVERRIDE {
message_center::MessageCenter* message_center = message_center::MessageCenter* message_center =
message_center::MessageCenter::Get(); message_center::MessageCenter::Get();
return message_center->NotificationCount(); return message_center->NotificationCount();
@ -160,21 +160,21 @@ typedef MessageCenterExtensionCrashRecoveryTest
class BalloonExtensionCrashRecoveryTest class BalloonExtensionCrashRecoveryTest
: public ExtensionCrashRecoveryTestBase { : public ExtensionCrashRecoveryTestBase {
protected: protected:
virtual void AcceptNotification(size_t index) { virtual void AcceptNotification(size_t index) OVERRIDE {
Balloon* balloon = GetNotificationDelegate(index); Balloon* balloon = GetNotificationDelegate(index);
ASSERT_TRUE(balloon); ASSERT_TRUE(balloon);
balloon->OnClick(); balloon->OnClick();
WaitForExtensionLoad(); WaitForExtensionLoad();
} }
virtual void CancelNotification(size_t index) { virtual void CancelNotification(size_t index) OVERRIDE {
Balloon* balloon = GetNotificationDelegate(index); Balloon* balloon = GetNotificationDelegate(index);
ASSERT_TRUE(balloon); ASSERT_TRUE(balloon);
std::string id = balloon->notification().notification_id(); std::string id = balloon->notification().notification_id();
ASSERT_TRUE(g_browser_process->notification_ui_manager()->CancelById(id)); ASSERT_TRUE(g_browser_process->notification_ui_manager()->CancelById(id));
} }
virtual size_t CountBalloons() { virtual size_t CountBalloons() OVERRIDE {
BalloonNotificationUIManager* manager = BalloonNotificationUIManager* manager =
BalloonNotificationUIManager::GetInstanceForTesting(); BalloonNotificationUIManager::GetInstanceForTesting();
BalloonCollection::Balloons balloons = BalloonCollection::Balloons balloons =

@ -81,7 +81,7 @@ class DeleteDirectiveHandler::DeleteDirectiveTask : public HistoryDBTask {
virtual void DoneRunOnMainThread() OVERRIDE; virtual void DoneRunOnMainThread() OVERRIDE;
private: private:
~DeleteDirectiveTask() {} virtual ~DeleteDirectiveTask() {}
// Process a list of global Id directives. Delete all visits to a URL in // Process a list of global Id directives. Delete all visits to a URL in
// time ranges of directives if the timestamp of one visit matches with one // time ranges of directives if the timestamp of one visit matches with one

@ -76,7 +76,7 @@ class MessageCenterChangeObserver
message_center::MessageCenter::Get()->AddObserver(this); message_center::MessageCenter::Get()->AddObserver(this);
} }
~MessageCenterChangeObserver() { virtual ~MessageCenterChangeObserver() {
message_center::MessageCenter::Get()->RemoveObserver(this); message_center::MessageCenter::Get()->RemoveObserver(this);
} }
@ -89,7 +89,7 @@ class MessageCenterChangeObserver
return notification_received_; return notification_received_;
} }
virtual void OnMessageCenterChanged(bool new_notification) { virtual void OnMessageCenterChanged(bool new_notification) OVERRIDE {
notification_received_ = true; notification_received_ = true;
if (message_loop_runner_) if (message_loop_runner_)
message_loop_runner_->Quit(); message_loop_runner_->Quit();

@ -36,7 +36,7 @@ class ComponentCloudPolicyService::Backend
Backend(base::WeakPtr<ComponentCloudPolicyService> service, Backend(base::WeakPtr<ComponentCloudPolicyService> service,
scoped_refptr<base::SequencedTaskRunner> task_runner, scoped_refptr<base::SequencedTaskRunner> task_runner,
scoped_ptr<ResourceCache> cache); scoped_ptr<ResourceCache> cache);
~Backend(); virtual ~Backend();
// This is invoked right after the constructor but on the backend background // This is invoked right after the constructor but on the backend background
// thread. Used to create the store on the right thread. // thread. Used to create the store on the right thread.

@ -47,7 +47,7 @@ class InvalidatorStorageTest : public testing::Test {
kAppNotificationsId_(kChromeSyncSourceId, "APP_NOTIFICATION"), kAppNotificationsId_(kChromeSyncSourceId, "APP_NOTIFICATION"),
kAutofillId_(kChromeSyncSourceId, "AUTOFILL") {} kAutofillId_(kChromeSyncSourceId, "AUTOFILL") {}
void SetUp() { virtual void SetUp() {
InvalidatorStorage::RegisterUserPrefs(pref_service_.registry()); InvalidatorStorage::RegisterUserPrefs(pref_service_.registry());
} }

@ -26,7 +26,7 @@ class TestAutofillExternalDelegate : public AutofillExternalDelegate {
AutofillManager* autofill_manager) AutofillManager* autofill_manager)
: AutofillExternalDelegate(web_contents, autofill_manager), : AutofillExternalDelegate(web_contents, autofill_manager),
popup_hidden_(true) {} popup_hidden_(true) {}
~TestAutofillExternalDelegate() {} virtual ~TestAutofillExternalDelegate() {}
virtual void OnPopupShown(content::KeyboardListener* listener) OVERRIDE { virtual void OnPopupShown(content::KeyboardListener* listener) OVERRIDE {
popup_hidden_ = false; popup_hidden_ = false;

@ -46,7 +46,7 @@ class MockAutofillManagerDelegate
MockAutofillManagerDelegate() {} MockAutofillManagerDelegate() {}
virtual ~MockAutofillManagerDelegate() {} virtual ~MockAutofillManagerDelegate() {}
virtual PrefService* GetPrefs() { return &prefs_; } virtual PrefService* GetPrefs() OVERRIDE { return &prefs_; }
private: private:
TestingPrefServiceSimple prefs_; TestingPrefServiceSimple prefs_;

@ -191,7 +191,7 @@ class FullscreenTestBrowserWindow : public TestBrowserWindow {
virtual ~FullscreenTestBrowserWindow() {} virtual ~FullscreenTestBrowserWindow() {}
// TestBrowserWindow overrides: // TestBrowserWindow overrides:
virtual bool ShouldHideUIForFullscreen() const { virtual bool ShouldHideUIForFullscreen() const OVERRIDE {
return fullscreen_; return fullscreen_;
} }
virtual bool IsFullscreen() const OVERRIDE { virtual bool IsFullscreen() const OVERRIDE {

@ -64,8 +64,10 @@ class MockDisplaySettingsProviderImpl :
// Overridden from DisplaySettingsProvider: // Overridden from DisplaySettingsProvider:
virtual gfx::Rect GetPrimaryDisplayArea() const OVERRIDE; virtual gfx::Rect GetPrimaryDisplayArea() const OVERRIDE;
virtual gfx::Rect GetPrimaryWorkArea() const OVERRIDE; virtual gfx::Rect GetPrimaryWorkArea() const OVERRIDE;
virtual gfx::Rect GetDisplayAreaMatching(const gfx::Rect& bounds) const; virtual gfx::Rect GetDisplayAreaMatching(
virtual gfx::Rect GetWorkAreaMatching(const gfx::Rect& bounds) const; const gfx::Rect& bounds) const OVERRIDE;
virtual gfx::Rect GetWorkAreaMatching(
const gfx::Rect& bounds) const OVERRIDE;
virtual bool IsAutoHidingDesktopBarEnabled( virtual bool IsAutoHidingDesktopBarEnabled(
DesktopBarAlignment alignment) OVERRIDE; DesktopBarAlignment alignment) OVERRIDE;
virtual int GetDesktopBarThickness( virtual int GetDesktopBarThickness(

@ -40,7 +40,7 @@ class ScrollableView : public views::View {
ScrollableView() {} ScrollableView() {}
virtual ~ScrollableView() {} virtual ~ScrollableView() {}
void Layout() OVERRIDE; virtual void Layout() OVERRIDE;
private: private:
DISALLOW_COPY_AND_ASSIGN(ScrollableView); DISALLOW_COPY_AND_ASSIGN(ScrollableView);

@ -14,7 +14,7 @@
namespace extensions { namespace extensions {
class PageLauncherManifestTest : public ExtensionManifestTest { class PageLauncherManifestTest : public ExtensionManifestTest {
void SetUp() OVERRIDE { virtual void SetUp() OVERRIDE {
ExtensionManifestTest::SetUp(); ExtensionManifestTest::SetUp();
(new PageLauncherHandler)->Register(); (new PageLauncherHandler)->Register();
// Required to be recognized as a platform app. // Required to be recognized as a platform app.

@ -131,13 +131,14 @@ class ManifestHandlerTest : public testing::Test {
return true; return true;
} }
virtual bool Validate(const Extension* extension, virtual bool Validate(
std::string* error, const Extension* extension,
std::vector<InstallWarning>* warnings) const { std::string* error,
std::vector<InstallWarning>* warnings) const OVERRIDE {
return return_value_; return return_value_;
} }
virtual bool AlwaysValidateForType(Manifest::Type type) const { virtual bool AlwaysValidateForType(Manifest::Type type) const OVERRIDE {
return always_validate_; return always_validate_;
} }

@ -56,7 +56,7 @@ class BenchmarkingWrapper : public v8::Extension {
) {} ) {}
virtual v8::Handle<v8::FunctionTemplate> GetNativeFunction( virtual v8::Handle<v8::FunctionTemplate> GetNativeFunction(
v8::Handle<v8::String> name) { v8::Handle<v8::String> name) OVERRIDE {
if (name->Equals(v8::String::New("GetCounter"))) { if (name->Equals(v8::String::New("GetCounter"))) {
return v8::FunctionTemplate::New(GetCounter); return v8::FunctionTemplate::New(GetCounter);
} else if (name->Equals(v8::String::New("IsSingleProcess"))) { } else if (name->Equals(v8::String::New("IsSingleProcess"))) {

@ -48,7 +48,7 @@ class NetBenchmarkingWrapper : public v8::Extension {
) {} ) {}
virtual v8::Handle<v8::FunctionTemplate> GetNativeFunction( virtual v8::Handle<v8::FunctionTemplate> GetNativeFunction(
v8::Handle<v8::String> name) { v8::Handle<v8::String> name) OVERRIDE {
if (name->Equals(v8::String::New("ClearCache"))) { if (name->Equals(v8::String::New("ClearCache"))) {
return v8::FunctionTemplate::New(ClearCache); return v8::FunctionTemplate::New(ClearCache);
} else if (name->Equals(v8::String::New("ClearHostResolverCache"))) { } else if (name->Equals(v8::String::New("ClearHostResolverCache"))) {

@ -248,7 +248,7 @@ class CloudPrintURLFetcherNoServiceProcess
context_getter_(new net::TestURLRequestContextGetter( context_getter_(new net::TestURLRequestContextGetter(
base::MessageLoopProxy::current())) {} base::MessageLoopProxy::current())) {}
protected: protected:
virtual net::URLRequestContextGetter* GetRequestContextGetter() { virtual net::URLRequestContextGetter* GetRequestContextGetter() OVERRIDE {
return context_getter_.get(); return context_getter_.get();
} }
@ -261,7 +261,7 @@ class CloudPrintURLFetcherNoServiceProcess
class CloudPrintURLFetcherNoServiceProcessFactory class CloudPrintURLFetcherNoServiceProcessFactory
: public CloudPrintURLFetcherFactory { : public CloudPrintURLFetcherFactory {
public: public:
virtual CloudPrintURLFetcher* CreateCloudPrintURLFetcher() { virtual CloudPrintURLFetcher* CreateCloudPrintURLFetcher() OVERRIDE {
return new CloudPrintURLFetcherNoServiceProcess; return new CloudPrintURLFetcherNoServiceProcess;
} }
@ -437,8 +437,8 @@ class MockPrintSystem : public PrintSystem {
class PrinterJobHandlerTest : public ::testing::Test { class PrinterJobHandlerTest : public ::testing::Test {
public: public:
PrinterJobHandlerTest(); PrinterJobHandlerTest();
void SetUp() OVERRIDE; virtual void SetUp() OVERRIDE;
void TearDown() OVERRIDE; virtual void TearDown() OVERRIDE;
void IdleOut(); void IdleOut();
bool GetPrinterInfo(printing::PrinterBasicInfo* info); bool GetPrinterInfo(printing::PrinterBasicInfo* info);
void SendCapsAndDefaults( void SendCapsAndDefaults(

@ -14,7 +14,7 @@ namespace cloud_print {
class TimeProviderImpl : public PrinterJobQueueHandler::TimeProvider { class TimeProviderImpl : public PrinterJobQueueHandler::TimeProvider {
public: public:
base::Time GetNow(); virtual base::Time GetNow() OVERRIDE;
}; };
base::Time TimeProviderImpl::GetNow() { base::Time TimeProviderImpl::GetNow() {

@ -31,7 +31,7 @@ class MockChrome : public StubChrome {
MockChrome() : web_view_("1") {} MockChrome() : web_view_("1") {}
virtual ~MockChrome() {} virtual ~MockChrome() {}
Status GetWebViews(std::list<WebView*>* web_views) OVERRIDE { virtual Status GetWebViews(std::list<WebView*>* web_views) OVERRIDE {
web_views->clear(); web_views->clear();
web_views->push_back(&web_view_); web_views->push_back(&web_view_);
return Status(kOk); return Status(kOk);

@ -264,7 +264,8 @@ class MergeToEffective : public MergeSettingsAndPolicies {
} }
// MergeSettingsAndPolicies override. // MergeSettingsAndPolicies override.
virtual scoped_ptr<base::Value> MergeValues(ValueParams values) { virtual scoped_ptr<base::Value> MergeValues(
ValueParams values) OVERRIDE {
std::string which; std::string which;
return MergeValues(values, &which); return MergeValues(values, &which);
} }
@ -276,7 +277,8 @@ class MergeToEffective : public MergeSettingsAndPolicies {
class MergeToAugmented : public MergeToEffective { class MergeToAugmented : public MergeToEffective {
protected: protected:
// MergeSettingsAndPolicies override. // MergeSettingsAndPolicies override.
virtual scoped_ptr<base::Value> MergeValues(ValueParams values) { virtual scoped_ptr<base::Value> MergeValues(
ValueParams values) OVERRIDE {
scoped_ptr<base::DictionaryValue> result(new base::DictionaryValue); scoped_ptr<base::DictionaryValue> result(new base::DictionaryValue);
std::string which_effective; std::string which_effective;
MergeToEffective::MergeValues(values, &which_effective).reset(); MergeToEffective::MergeValues(values, &which_effective).reset();

@ -60,7 +60,7 @@ class MockAutofillManagerDelegate
public: public:
MockAutofillManagerDelegate() {} MockAutofillManagerDelegate() {}
virtual ~MockAutofillManagerDelegate() {} virtual ~MockAutofillManagerDelegate() {}
virtual PrefService* GetPrefs() { return &prefs_; } virtual PrefService* GetPrefs() OVERRIDE { return &prefs_; }
private: private:
TestingPrefServiceSimple prefs_; TestingPrefServiceSimple prefs_;

@ -90,7 +90,7 @@ class NoTransportFactory : public ImageTransportFactory {
return 0; return 0;
} }
void WaitSyncPoint(uint32 sync_point) OVERRIDE { virtual void WaitSyncPoint(uint32 sync_point) OVERRIDE {
} }
// We don't generate lost context events, so we don't need to keep track of // We don't generate lost context events, so we don't need to keep track of
@ -588,7 +588,7 @@ class GpuProcessTransportFactory
virtual ~MainThreadContextProvider() {} virtual ~MainThreadContextProvider() {}
virtual scoped_ptr<WebGraphicsContext3DCommandBufferImpl> virtual scoped_ptr<WebGraphicsContext3DCommandBufferImpl>
CreateOffscreenContext3d() { CreateOffscreenContext3d() OVERRIDE {
return make_scoped_ptr(factory_->CreateOffscreenContext()); return make_scoped_ptr(factory_->CreateOffscreenContext());
} }
@ -623,7 +623,7 @@ class GpuProcessTransportFactory
virtual ~CompositorThreadContextProvider() {} virtual ~CompositorThreadContextProvider() {}
virtual scoped_ptr<WebGraphicsContext3DCommandBufferImpl> virtual scoped_ptr<WebGraphicsContext3DCommandBufferImpl>
CreateOffscreenContext3d() { CreateOffscreenContext3d() OVERRIDE {
return make_scoped_ptr(factory_->CreateOffscreenContext()); return make_scoped_ptr(factory_->CreateOffscreenContext());
} }

@ -255,7 +255,7 @@ class CaptureTestRenderViewHostFactory : public RenderViewHostFactory {
RenderWidgetHostDelegate* widget_delegate, RenderWidgetHostDelegate* widget_delegate,
int routing_id, int routing_id,
bool swapped_out, bool swapped_out,
SessionStorageNamespace* session_storage_namespace) { SessionStorageNamespace* session_storage_namespace) OVERRIDE {
return new CaptureTestRenderViewHost(instance, delegate, widget_delegate, return new CaptureTestRenderViewHost(instance, delegate, widget_delegate,
routing_id, swapped_out, controller_); routing_id, swapped_out, controller_);
} }

@ -33,7 +33,8 @@ class ContextProviderCommandBuffer::MemoryAllocationCallbackProxy
provider_->context3d_->setMemoryAllocationChangedCallbackCHROMIUM(this); provider_->context3d_->setMemoryAllocationChangedCallbackCHROMIUM(this);
} }
void onMemoryAllocationChanged(WebKit::WebGraphicsMemoryAllocation alloc) { virtual void onMemoryAllocationChanged(
WebKit::WebGraphicsMemoryAllocation alloc) {
provider_->OnMemoryAllocationChanged(!!alloc.gpuResourceSizeInBytes); provider_->OnMemoryAllocationChanged(!!alloc.gpuResourceSizeInBytes);
} }

@ -42,7 +42,7 @@ class TestRendererAccessibilityComplete : public RendererAccessibilityComplete {
TestRendererAccessibilityComplete* owner_; TestRendererAccessibilityComplete* owner_;
}; };
virtual BrowserTreeNode* CreateBrowserTreeNode() { virtual BrowserTreeNode* CreateBrowserTreeNode() OVERRIDE {
return new TestBrowserTreeNode(this); return new TestBrowserTreeNode(this);
} }

@ -246,7 +246,7 @@ class RenderThreadImpl::RendererContextProviderCommandBuffer
virtual ~RendererContextProviderCommandBuffer() {} virtual ~RendererContextProviderCommandBuffer() {}
virtual scoped_ptr<WebGraphicsContext3DCommandBufferImpl> virtual scoped_ptr<WebGraphicsContext3DCommandBufferImpl>
CreateOffscreenContext3d() { CreateOffscreenContext3d() OVERRIDE {
RenderThreadImpl* self = RenderThreadImpl::current(); RenderThreadImpl* self = RenderThreadImpl::current();
DCHECK(self); DCHECK(self);
return self->CreateOffscreenContext3d().Pass(); return self->CreateOffscreenContext3d().Pass();

@ -90,7 +90,7 @@ class GLARBTimerTrace : public Trace {
virtual void Process() OVERRIDE; virtual void Process() OVERRIDE;
private: private:
~GLARBTimerTrace(); virtual ~GLARBTimerTrace();
void Output(); void Output();
@ -118,7 +118,7 @@ class NoopTrace : public Trace {
virtual void Process() OVERRIDE {} virtual void Process() OVERRIDE {}
private: private:
~NoopTrace() {} virtual ~NoopTrace() {}
DISALLOW_COPY_AND_ASSIGN(NoopTrace); DISALLOW_COPY_AND_ASSIGN(NoopTrace);
}; };

@ -13,7 +13,7 @@ namespace test {
class LeakyBucketTest : public ::testing::Test { class LeakyBucketTest : public ::testing::Test {
protected: protected:
void SetUp() { virtual void SetUp() {
leaky_bucket_.reset(new LeakyBucket(QuicBandwidth::Zero())); leaky_bucket_.reset(new LeakyBucket(QuicBandwidth::Zero()));
} }
MockClock clock_; MockClock clock_;

@ -26,11 +26,12 @@ class OneShotVisitor : public CryptoFramerVisitorInterface {
error_(false) { error_(false) {
} }
void OnError(CryptoFramer* framer) { virtual void OnError(CryptoFramer* framer) OVERRIDE {
error_ = true; error_ = true;
} }
void OnHandshakeMessage(const CryptoHandshakeMessage& message) { virtual void OnHandshakeMessage(
const CryptoHandshakeMessage& message) OVERRIDE {
*out_ = message; *out_ = message;
} }

@ -26,7 +26,7 @@ class TestQuicVisitor : public NoOpFramerVisitor {
} }
// NoOpFramerVisitor // NoOpFramerVisitor
virtual void OnStreamFrame(const QuicStreamFrame& frame) { virtual void OnStreamFrame(const QuicStreamFrame& frame) OVERRIDE {
frame_ = frame; frame_ = frame;
frame_valid_ = true; frame_valid_ = true;
} }
@ -51,8 +51,10 @@ class TestMockSession : public MockSession {
} }
virtual ~TestMockSession() {} virtual ~TestMockSession() {}
virtual QuicConsumedData WriteData(QuicStreamId id, base::StringPiece data, virtual QuicConsumedData WriteData(QuicStreamId id,
QuicStreamOffset offset, bool fin) { base::StringPiece data,
QuicStreamOffset offset,
bool fin) OVERRIDE {
return QuicSession::WriteData(id, data, offset, fin); return QuicSession::WriteData(id, data, offset, fin);
} }
}; };

@ -38,7 +38,7 @@ class TestQuicVisitor : public NoOpFramerVisitor {
TestQuicVisitor() {} TestQuicVisitor() {}
// NoOpFramerVisitor // NoOpFramerVisitor
virtual void OnStreamFrame(const QuicStreamFrame& frame) { virtual void OnStreamFrame(const QuicStreamFrame& frame) OVERRIDE {
frame_ = frame; frame_ = frame;
} }

@ -225,7 +225,7 @@ class TestQuicVisitor : public ::net::QuicFramerVisitorInterface {
connection_close_frame_ = frame; connection_close_frame_ = frame;
} }
virtual void OnGoAwayFrame(const QuicGoAwayFrame& frame) { virtual void OnGoAwayFrame(const QuicGoAwayFrame& frame) OVERRIDE {
goaway_frame_ = frame; goaway_frame_ = frame;
} }

@ -21,7 +21,7 @@ class SimpleFramerVisitor : public QuicFramerVisitorInterface {
: error_(QUIC_NO_ERROR) { : error_(QUIC_NO_ERROR) {
} }
virtual void OnError(QuicFramer* framer) { virtual void OnError(QuicFramer* framer) OVERRIDE {
error_ = framer->error(); error_ = framer->error();
} }
@ -29,21 +29,22 @@ class SimpleFramerVisitor : public QuicFramerVisitorInterface {
return false; return false;
} }
virtual void OnPacket() {} virtual void OnPacket() OVERRIDE {}
virtual void OnPublicResetPacket(const QuicPublicResetPacket& packet) {} virtual void OnPublicResetPacket(
const QuicPublicResetPacket& packet) OVERRIDE {}
virtual void OnVersionNegotiationPacket( virtual void OnVersionNegotiationPacket(
const QuicVersionNegotiationPacket& packet) {} const QuicVersionNegotiationPacket& packet) OVERRIDE {}
virtual void OnRevivedPacket() {} virtual void OnRevivedPacket() OVERRIDE {}
virtual bool OnPacketHeader(const QuicPacketHeader& header) { virtual bool OnPacketHeader(const QuicPacketHeader& header) OVERRIDE {
has_header_ = true; has_header_ = true;
header_ = header; header_ = header;
return true; return true;
} }
virtual void OnFecProtectedPayload(StringPiece payload) {} virtual void OnFecProtectedPayload(StringPiece payload) OVERRIDE {}
virtual void OnStreamFrame(const QuicStreamFrame& frame) { virtual void OnStreamFrame(const QuicStreamFrame& frame) OVERRIDE {
// Save a copy of the data so it is valid after the packet is processed. // Save a copy of the data so it is valid after the packet is processed.
stream_data_.push_back(frame.data.as_string()); stream_data_.push_back(frame.data.as_string());
QuicStreamFrame stream_frame(frame); QuicStreamFrame stream_frame(frame);
@ -52,35 +53,35 @@ class SimpleFramerVisitor : public QuicFramerVisitorInterface {
stream_frames_.push_back(stream_frame); stream_frames_.push_back(stream_frame);
} }
virtual void OnAckFrame(const QuicAckFrame& frame) { virtual void OnAckFrame(const QuicAckFrame& frame) OVERRIDE {
ack_frames_.push_back(frame); ack_frames_.push_back(frame);
} }
virtual void OnCongestionFeedbackFrame( virtual void OnCongestionFeedbackFrame(
const QuicCongestionFeedbackFrame& frame) { const QuicCongestionFeedbackFrame& frame) OVERRIDE {
feedback_frames_.push_back(frame); feedback_frames_.push_back(frame);
} }
virtual void OnFecData(const QuicFecData& fec) { virtual void OnFecData(const QuicFecData& fec) OVERRIDE {
fec_data_ = fec; fec_data_ = fec;
fec_redundancy_ = fec_data_.redundancy.as_string(); fec_redundancy_ = fec_data_.redundancy.as_string();
fec_data_.redundancy = fec_redundancy_; fec_data_.redundancy = fec_redundancy_;
} }
virtual void OnRstStreamFrame(const QuicRstStreamFrame& frame) { virtual void OnRstStreamFrame(const QuicRstStreamFrame& frame) OVERRIDE {
rst_stream_frames_.push_back(frame); rst_stream_frames_.push_back(frame);
} }
virtual void OnConnectionCloseFrame( virtual void OnConnectionCloseFrame(
const QuicConnectionCloseFrame& frame) { const QuicConnectionCloseFrame& frame) OVERRIDE {
connection_close_frames_.push_back(frame); connection_close_frames_.push_back(frame);
} }
virtual void OnGoAwayFrame(const QuicGoAwayFrame& frame) { virtual void OnGoAwayFrame(const QuicGoAwayFrame& frame) OVERRIDE {
goaway_frames_.push_back(frame); goaway_frames_.push_back(frame);
} }
virtual void OnPacketComplete() {} virtual void OnPacketComplete() OVERRIDE {}
const QuicPacketHeader& header() const { return header_; } const QuicPacketHeader& header() const { return header_; }
const vector<QuicAckFrame>& ack_frames() const { return ack_frames_; } const vector<QuicAckFrame>& ack_frames() const { return ack_frames_; }

@ -30,7 +30,7 @@ class FakeDesktopResizer : public DesktopResizer {
} }
} }
~FakeDesktopResizer() { virtual ~FakeDesktopResizer() {
EXPECT_EQ(initial_size_, GetCurrentSize()); EXPECT_EQ(initial_size_, GetCurrentSize());
} }

@ -128,13 +128,15 @@ class ContextProviderFromContextFactory : public cc::ContextProvider {
return !!context3d_; return !!context3d_;
} }
virtual bool BindToCurrentThread() { virtual bool BindToCurrentThread() OVERRIDE {
return context3d_->makeContextCurrent(); return context3d_->makeContextCurrent();
} }
virtual WebKit::WebGraphicsContext3D* Context3d() { return context3d_.get(); } virtual WebKit::WebGraphicsContext3D* Context3d() OVERRIDE {
return context3d_.get();
}
virtual class GrContext* GrContext() { virtual class GrContext* GrContext() OVERRIDE {
if (!gr_context_) { if (!gr_context_) {
gr_context_.reset( gr_context_.reset(
new webkit::gpu::GrContextForWebGraphicsContext3D(context3d_.get())); new webkit::gpu::GrContextForWebGraphicsContext3D(context3d_.get()));
@ -149,7 +151,7 @@ class ContextProviderFromContextFactory : public cc::ContextProvider {
destroyed_ = true; destroyed_ = true;
} }
bool DestroyedOnMainThread() { virtual bool DestroyedOnMainThread() OVERRIDE {
base::AutoLock lock(destroyed_lock_); base::AutoLock lock(destroyed_lock_);
return destroyed_; return destroyed_;
} }

@ -210,7 +210,7 @@ class WebNotificationButtonView2 : public WebNotificationButtonViewBase,
private: private:
// Overridden from views::View: // Overridden from views::View:
virtual void ChildVisibilityChanged(views::View* child) { virtual void ChildVisibilityChanged(views::View* child) OVERRIDE {
InvalidateLayout(); InvalidateLayout();
} }

@ -36,7 +36,8 @@ class ContextProviderInProcess::MemoryAllocationCallbackProxy
provider_->context3d_->setMemoryAllocationChangedCallbackCHROMIUM(this); provider_->context3d_->setMemoryAllocationChangedCallbackCHROMIUM(this);
} }
void onMemoryAllocationChanged(WebKit::WebGraphicsMemoryAllocation alloc) { virtual void onMemoryAllocationChanged(
WebKit::WebGraphicsMemoryAllocation alloc) {
provider_->OnMemoryAllocationChanged(!!alloc.gpuResourceSizeInBytes); provider_->OnMemoryAllocationChanged(!!alloc.gpuResourceSizeInBytes);
} }

@ -967,7 +967,7 @@ class ResourceLoaderBridgeImpl : public ResourceLoaderBridge {
static_cast<SyncRequestProxy*>(proxy_)->WaitForCompletion(); static_cast<SyncRequestProxy*>(proxy_)->WaitForCompletion();
} }
virtual void DidChangePriority(net::RequestPriority new_priority) { virtual void DidChangePriority(net::RequestPriority new_priority) OVERRIDE {
// Not really needed for DRT. // Not really needed for DRT.
} }