diff options
23 files changed, 92 insertions, 82 deletions
diff --git a/base/debug/trace_event_impl.cc b/base/debug/trace_event_impl.cc index f5dbcc8..871ac9c 100644 --- a/base/debug/trace_event_impl.cc +++ b/base/debug/trace_event_impl.cc @@ -103,9 +103,9 @@ class TraceBufferRingBuffer : public TraceBuffer { logged_events_.reserve(kTraceEventInitialBufferSize); } - ~TraceBufferRingBuffer() {} + virtual ~TraceBufferRingBuffer() {} - void AddEvent(const TraceEvent& event) OVERRIDE { + virtual void AddEvent(const TraceEvent& event) OVERRIDE { if (unused_event_index_ < Size()) logged_events_[unused_event_index_] = event; else @@ -117,11 +117,11 @@ class TraceBufferRingBuffer : public TraceBuffer { } } - bool HasMoreEvents() const OVERRIDE { + virtual bool HasMoreEvents() const OVERRIDE { return oldest_event_index_ != unused_event_index_; } - const TraceEvent& NextEvent() OVERRIDE { + virtual const TraceEvent& NextEvent() OVERRIDE { DCHECK(HasMoreEvents()); size_t next = oldest_event_index_; @@ -129,12 +129,13 @@ class TraceBufferRingBuffer : public TraceBuffer { return GetEventAt(next); } - bool IsFull() const OVERRIDE { + virtual bool IsFull() const OVERRIDE { return false; } - size_t CountEnabledByName(const unsigned char* category, - const std::string& event_name) const OVERRIDE { + virtual size_t CountEnabledByName( + const unsigned char* category, + const std::string& event_name) const OVERRIDE { size_t notify_count = 0; size_t index = oldest_event_index_; while (index != unused_event_index_) { @@ -148,12 +149,12 @@ class TraceBufferRingBuffer : public TraceBuffer { return notify_count; } - const TraceEvent& GetEventAt(size_t index) const OVERRIDE { + virtual const TraceEvent& GetEventAt(size_t index) const OVERRIDE { DCHECK(index < logged_events_.size()); return logged_events_[index]; } - size_t Size() const OVERRIDE { + virtual size_t Size() const OVERRIDE { return logged_events_.size(); } @@ -171,10 +172,10 @@ class TraceBufferVector : public TraceBuffer { logged_events_.reserve(kTraceEventInitialBufferSize); } - ~TraceBufferVector() { + virtual ~TraceBufferVector() { } - void AddEvent(const TraceEvent& event) OVERRIDE { + virtual void AddEvent(const TraceEvent& event) OVERRIDE { // Note, we have two callers which need to be handled. The first is // AddTraceEventWithThreadIdAndTimestamp() which checks Size() and does an // early exit if full. The second is AddThreadNameMetadataEvents(). @@ -183,21 +184,22 @@ class TraceBufferVector : public TraceBuffer { logged_events_.push_back(event); } - bool HasMoreEvents() const OVERRIDE { + virtual bool HasMoreEvents() const OVERRIDE { return current_iteration_index_ < Size(); } - const TraceEvent& NextEvent() OVERRIDE { + virtual const TraceEvent& NextEvent() OVERRIDE { DCHECK(HasMoreEvents()); return GetEventAt(current_iteration_index_++); } - bool IsFull() const OVERRIDE { + virtual bool IsFull() const OVERRIDE { return Size() >= kTraceEventBufferSize; } - size_t CountEnabledByName(const unsigned char* category, - const std::string& event_name) const OVERRIDE { + virtual size_t CountEnabledByName( + const unsigned char* category, + const std::string& event_name) const OVERRIDE { size_t notify_count = 0; for (size_t i = 0; i < Size(); i++) { const TraceEvent& event = GetEventAt(i); @@ -209,12 +211,12 @@ class TraceBufferVector : public TraceBuffer { return notify_count; } - const TraceEvent& GetEventAt(size_t index) const OVERRIDE { + virtual const TraceEvent& GetEventAt(size_t index) const OVERRIDE { DCHECK(index < logged_events_.size()); return logged_events_[index]; } - size_t Size() const OVERRIDE { + virtual size_t Size() const OVERRIDE { return logged_events_.size(); } diff --git a/cc/layers/texture_layer_unittest.cc b/cc/layers/texture_layer_unittest.cc index 912eff9..a6d1e07 100644 --- a/cc/layers/texture_layer_unittest.cc +++ b/cc/layers/texture_layer_unittest.cc @@ -497,11 +497,11 @@ class TextureLayerClientTest : context.PassAs<WebKit::WebGraphicsContext3D>()).PassAs<OutputSurface>(); } - virtual unsigned PrepareTexture(ResourceUpdateQueue* queue) { + virtual unsigned PrepareTexture(ResourceUpdateQueue* queue) OVERRIDE { return texture_; } - virtual WebKit::WebGraphicsContext3D* Context3d() { + virtual WebKit::WebGraphicsContext3D* Context3d() OVERRIDE { return context_; } diff --git a/cc/resources/picture.cc b/cc/resources/picture.cc index d3ddc53..6b4abb8 100644 --- a/cc/resources/picture.cc +++ b/cc/resources/picture.cc @@ -22,7 +22,7 @@ const char kLabelLazyDecoded[] = "lazy"; class DisableLCDTextFilter : public SkDrawFilter { public: // SkDrawFilter interface. - virtual bool filter(SkPaint* paint, SkDrawFilter::Type type) { + virtual bool filter(SkPaint* paint, SkDrawFilter::Type type) OVERRIDE { if (type != SkDrawFilter::kText_Type) return true; diff --git a/chrome/browser/download/download_browsertest.cc b/chrome/browser/download/download_browsertest.cc index 4b03802..7c63cb7 100644 --- a/chrome/browser/download/download_browsertest.cc +++ b/chrome/browser/download/download_browsertest.cc @@ -119,8 +119,8 @@ class CreatedObserver : public content::DownloadManager::Observer { } private: - virtual void OnDownloadCreated( - content::DownloadManager* manager, content::DownloadItem* item) { + virtual void OnDownloadCreated(content::DownloadManager* manager, + content::DownloadItem* item) OVERRIDE { DCHECK_EQ(manager_, manager); if (waiting_) MessageLoopForUI::current()->Quit(); diff --git a/chrome/browser/extensions/startup_helper.cc b/chrome/browser/extensions/startup_helper.cc index 1c1f18b..5ee3ac7 100644 --- a/chrome/browser/extensions/startup_helper.cc +++ b/chrome/browser/extensions/startup_helper.cc @@ -106,7 +106,7 @@ class ValidateCrxHelper : public SandboxedUnpackerClient { virtual void OnUnpackSuccess(const base::FilePath& temp_dir, const base::FilePath& extension_root, const base::DictionaryValue* original_manifest, - const Extension* extension) { + const Extension* extension) OVERRIDE { finished_ = true; success_ = true; BrowserThread::PostTask(BrowserThread::UI, @@ -115,7 +115,7 @@ class ValidateCrxHelper : public SandboxedUnpackerClient { this)); } - virtual void OnUnpackFailure(const string16& error) { + virtual void OnUnpackFailure(const string16& error) OVERRIDE { finished_ = true; success_ = false; error_ = error; diff --git a/chrome/browser/extensions/startup_helper_browsertest.cc b/chrome/browser/extensions/startup_helper_browsertest.cc index 4d1d129..fef25ee 100644 --- a/chrome/browser/extensions/startup_helper_browsertest.cc +++ b/chrome/browser/extensions/startup_helper_browsertest.cc @@ -17,7 +17,7 @@ class StartupHelperBrowserTest : public InProcessBrowserTest { StartupHelperBrowserTest() {} virtual ~StartupHelperBrowserTest() {} - virtual void SetUpCommandLine(CommandLine* command_line) { + virtual void SetUpCommandLine(CommandLine* command_line) OVERRIDE { command_line->AppendSwitch(switches::kNoStartupWindow); PathService::Get(chrome::DIR_TEST_DATA, &test_data_dir_); test_data_dir_ = test_data_dir_.AppendASCII("extensions"); diff --git a/chrome/browser/notifications/message_center_notifications_browsertest.cc b/chrome/browser/notifications/message_center_notifications_browsertest.cc index e848081..ea58bc2 100644 --- a/chrome/browser/notifications/message_center_notifications_browsertest.cc +++ b/chrome/browser/notifications/message_center_notifications_browsertest.cc @@ -25,7 +25,7 @@ class MessageCenterNotificationsTest : public InProcessBrowserTest { public: MessageCenterNotificationsTest() {} - virtual void SetUpCommandLine(CommandLine* command_line) { + virtual void SetUpCommandLine(CommandLine* command_line) OVERRIDE { // This switch enables the new piping of Notifications through Message // Center. command_line->AppendSwitch( @@ -47,19 +47,21 @@ class MessageCenterNotificationsTest : public InProcessBrowserTest { public: explicit TestDelegate(const std::string& id) : id_(id) {} - void Display() OVERRIDE { log_ += "Display_"; } - void Error() OVERRIDE { log_ += "Error_"; } - void Close(bool by_user) OVERRIDE { + virtual void Display() OVERRIDE { log_ += "Display_"; } + virtual void Error() OVERRIDE { log_ += "Error_"; } + virtual void Close(bool by_user) OVERRIDE { log_ += "Close_"; log_ += ( by_user ? "by_user_" : "programmatically_"); } - void Click() OVERRIDE { log_ += "Click_"; } - void ButtonClick(int button_index) OVERRIDE { + virtual void Click() OVERRIDE { log_ += "Click_"; } + virtual void ButtonClick(int button_index) OVERRIDE { log_ += "ButtonClick_"; log_ += base::IntToString(button_index) + "_"; } - std::string id() const OVERRIDE { return id_; } - content::RenderViewHost* GetRenderViewHost() const OVERRIDE { return NULL; } + virtual std::string id() const OVERRIDE { return id_; } + virtual content::RenderViewHost* GetRenderViewHost() const OVERRIDE { + return NULL; + } const std::string& log() { return log_; } diff --git a/chrome/browser/notifications/sync_notifier/synced_notification_unittest.cc b/chrome/browser/notifications/sync_notifier/synced_notification_unittest.cc index d508e1a..7d3e73c 100644 --- a/chrome/browser/notifications/sync_notifier/synced_notification_unittest.cc +++ b/chrome/browser/notifications/sync_notifier/synced_notification_unittest.cc @@ -73,7 +73,7 @@ const sync_pb::CoalescedSyncedNotification_ReadState kDismissed = class SyncedNotificationTest : public testing::Test { public: SyncedNotificationTest() {} - ~SyncedNotificationTest() {} + virtual ~SyncedNotificationTest() {} // Methods from testing::Test. diff --git a/chrome/browser/password_manager/password_manager_browsertest.cc b/chrome/browser/password_manager/password_manager_browsertest.cc index e420341..7a4596e 100644 --- a/chrome/browser/password_manager/password_manager_browsertest.cc +++ b/chrome/browser/password_manager/password_manager_browsertest.cc @@ -60,10 +60,11 @@ class NavigationObserver : public content::NotificationObserver, } // content::WebContentsObserver - virtual void DidFinishLoad(int64 frame_id, - const GURL& validated_url, - bool is_main_frame, - content::RenderViewHost* render_view_host) { + virtual void DidFinishLoad( + int64 frame_id, + const GURL& validated_url, + bool is_main_frame, + content::RenderViewHost* render_view_host) OVERRIDE { message_loop_runner_->Quit(); } diff --git a/chrome/browser/sync/glue/autofill_data_type_controller_unittest.cc b/chrome/browser/sync/glue/autofill_data_type_controller_unittest.cc index 7d420f9..d89afb0 100644 --- a/chrome/browser/sync/glue/autofill_data_type_controller_unittest.cc +++ b/chrome/browser/sync/glue/autofill_data_type_controller_unittest.cc @@ -118,7 +118,7 @@ class MockWebDataServiceWrapperSyncable : public MockWebDataServiceWrapper { : MockWebDataServiceWrapper(NULL, new FakeWebDataService()) { } - void Shutdown() OVERRIDE { + virtual void Shutdown() OVERRIDE { static_cast<FakeWebDataService*>( fake_autofill_web_data_.get())->ShutdownOnUIThread(); } diff --git a/chrome/browser/ui/cocoa/location_bar/action_box_menu_bubble_controller_unittest.mm b/chrome/browser/ui/cocoa/location_bar/action_box_menu_bubble_controller_unittest.mm index 0b62b36..f24ca1b 100644 --- a/chrome/browser/ui/cocoa/location_bar/action_box_menu_bubble_controller_unittest.mm +++ b/chrome/browser/ui/cocoa/location_bar/action_box_menu_bubble_controller_unittest.mm @@ -26,22 +26,22 @@ const CGFloat kAnchorPointY = 300; class MenuDelegate : public ui::SimpleMenuModel::Delegate { public: // Methods for determining the state of specific command ids. - virtual bool IsCommandIdChecked(int command_id) const { + virtual bool IsCommandIdChecked(int command_id) const OVERRIDE { return false; } - virtual bool IsCommandIdEnabled(int command_id) const { + virtual bool IsCommandIdEnabled(int command_id) const OVERRIDE { return true; } virtual bool GetAcceleratorForCommandId( int command_id, - ui::Accelerator* accelerator) { + ui::Accelerator* accelerator) OVERRIDE { return false; } // Performs the action associated with the specified command id. - virtual void ExecuteCommand(int command_id, int event_flags) { + virtual void ExecuteCommand(int command_id, int event_flags) OVERRIDE { } }; diff --git a/components/autofill/browser/autocomplete_history_manager_unittest.cc b/components/autofill/browser/autocomplete_history_manager_unittest.cc index b04d5b9..673e2c1 100644 --- a/components/autofill/browser/autocomplete_history_manager_unittest.cc +++ b/components/autofill/browser/autocomplete_history_manager_unittest.cc @@ -66,7 +66,7 @@ class MockWebDataServiceWrapperCurrent : public MockWebDataServiceWrapperBase { MockWebDataServiceWrapperCurrent() {} - scoped_refptr<AutofillWebDataService> GetAutofillWebData() OVERRIDE { + virtual scoped_refptr<AutofillWebDataService> GetAutofillWebData() OVERRIDE { return MockWebDataService::GetCurrent(); } diff --git a/content/browser/devtools/devtools_external_agent_proxy_impl.cc b/content/browser/devtools/devtools_external_agent_proxy_impl.cc index d5cb741..5ecaa57 100644 --- a/content/browser/devtools/devtools_external_agent_proxy_impl.cc +++ b/content/browser/devtools/devtools_external_agent_proxy_impl.cc @@ -22,7 +22,7 @@ class DevToolsExternalAgentProxyImpl::ForwardingAgentHost } private: - ~ForwardingAgentHost() { + virtual ~ForwardingAgentHost() { } // DevToolsAgentHostImpl implementation. diff --git a/content/browser/devtools/devtools_manager_unittest.cc b/content/browser/devtools/devtools_manager_unittest.cc index 07451d6..1208856 100644 --- a/content/browser/devtools/devtools_manager_unittest.cc +++ b/content/browser/devtools/devtools_manager_unittest.cc @@ -259,7 +259,7 @@ class TestExternalAgentDelegate: public DevToolsExternalAgentProxyDelegate { }; public : - ~TestExternalAgentDelegate() { + virtual ~TestExternalAgentDelegate() { expectEvent(1, "Attach"); expectEvent(1, "Detach"); expectEvent(0, "SendMessageToBackend.message0"); diff --git a/content/browser/download/download_browsertest.cc b/content/browser/download/download_browsertest.cc index 8f49cee..1a2773c 100644 --- a/content/browser/download/download_browsertest.cc +++ b/content/browser/download/download_browsertest.cc @@ -436,20 +436,20 @@ class DownloadCreateObserver : DownloadManager::Observer { manager_->AddObserver(this); } - ~DownloadCreateObserver() { + virtual ~DownloadCreateObserver() { if (manager_) manager_->RemoveObserver(this); manager_ = NULL; } - virtual void ManagerGoingDown(DownloadManager* manager) { + virtual void ManagerGoingDown(DownloadManager* manager) OVERRIDE { DCHECK_EQ(manager_, manager); manager_->RemoveObserver(this); manager_ = NULL; } virtual void OnDownloadCreated(DownloadManager* manager, - DownloadItem* download) { + DownloadItem* download) OVERRIDE { if (!item_) item_ = download; diff --git a/content/browser/renderer_host/media/web_contents_video_capture_device.cc b/content/browser/renderer_host/media/web_contents_video_capture_device.cc index 6305a34..95fe32c 100644 --- a/content/browser/renderer_host/media/web_contents_video_capture_device.cc +++ b/content/browser/renderer_host/media/web_contents_video_capture_device.cc @@ -329,12 +329,13 @@ class CaptureMachine : public WebContentsObserver, RenewFrameSubscription(); } - virtual void AboutToNavigateRenderView(RenderViewHost* rvh) { + virtual void AboutToNavigateRenderView(RenderViewHost* rvh) OVERRIDE { RenewFrameSubscription(); } virtual void DidNavigateMainFrame( - const LoadCommittedDetails& details, const FrameNavigateParams& params) { + const LoadCommittedDetails& details, + const FrameNavigateParams& params) OVERRIDE { RenewFrameSubscription(); } diff --git a/content/browser/storage_partition_impl_map.cc b/content/browser/storage_partition_impl_map.cc index 16111cf..ba3e36f1 100644 --- a/content/browser/storage_partition_impl_map.cc +++ b/content/browser/storage_partition_impl_map.cc @@ -90,7 +90,7 @@ class BlobProtocolHandler : public net::URLRequestJobFactory::ProtocolHandler { virtual net::URLRequestJob* MaybeCreateJob( net::URLRequest* request, - net::NetworkDelegate* network_delegate) const { + net::NetworkDelegate* network_delegate) const OVERRIDE { scoped_refptr<Stream> stream = stream_context_->registry()->GetStream(request->url()); if (stream) diff --git a/content/renderer/media/webrtc_audio_capturer.cc b/content/renderer/media/webrtc_audio_capturer.cc index e37df57..8e78142 100644 --- a/content/renderer/media/webrtc_audio_capturer.cc +++ b/content/renderer/media/webrtc_audio_capturer.cc @@ -94,7 +94,7 @@ class WebRtcAudioCapturer::SinkOwner }; private: - ~SinkOwner() {} + virtual ~SinkOwner() {} friend class base::RefCounted<WebRtcAudioCapturer::SinkOwner>; WebRtcAudioCapturerSink* delegate_; diff --git a/net/quic/quic_framer_test.cc b/net/quic/quic_framer_test.cc index 8856897..58deca9 100644 --- a/net/quic/quic_framer_test.cc +++ b/net/quic/quic_framer_test.cc @@ -100,10 +100,10 @@ class TestEncrypter : public QuicEncrypter { virtual size_t GetCiphertextSize(size_t plaintext_size) const OVERRIDE { return plaintext_size; } - virtual StringPiece GetKey() const { + virtual StringPiece GetKey() const OVERRIDE { return StringPiece(); } - virtual StringPiece GetNoncePrefix() const { + virtual StringPiece GetNoncePrefix() const OVERRIDE { return StringPiece(); } QuicPacketSequenceNumber sequence_number_; @@ -136,10 +136,10 @@ class TestDecrypter : public QuicDecrypter { ciphertext_ = ciphertext.as_string(); return new QuicData(ciphertext.data(), ciphertext.length()); } - virtual StringPiece GetKey() const { + virtual StringPiece GetKey() const OVERRIDE { return StringPiece(); } - virtual StringPiece GetNoncePrefix() const { + virtual StringPiece GetNoncePrefix() const OVERRIDE { return StringPiece(); } QuicPacketSequenceNumber sequence_number_; diff --git a/net/quic/test_tools/simple_quic_framer.cc b/net/quic/test_tools/simple_quic_framer.cc index 5d21b73..a007186 100644 --- a/net/quic/test_tools/simple_quic_framer.cc +++ b/net/quic/test_tools/simple_quic_framer.cc @@ -25,7 +25,7 @@ class SimpleFramerVisitor : public QuicFramerVisitorInterface { error_ = framer->error(); } - virtual bool OnProtocolVersionMismatch(QuicVersionTag version) { + virtual bool OnProtocolVersionMismatch(QuicVersionTag version) OVERRIDE { return false; } diff --git a/remoting/protocol/third_party_authenticator_unittest.cc b/remoting/protocol/third_party_authenticator_unittest.cc index a7dfcbe..fc95f82 100644 --- a/remoting/protocol/third_party_authenticator_unittest.cc +++ b/remoting/protocol/third_party_authenticator_unittest.cc @@ -43,7 +43,7 @@ class ThirdPartyAuthenticatorTest : public AuthenticatorTestBase { const GURL& token_url, const std::string& host_public_key, const std::string& scope, - const TokenFetchedCallback& token_fetched_callback) { + const TokenFetchedCallback& token_fetched_callback) OVERRIDE { ASSERT_EQ(token_url.spec(), kTokenUrl); ASSERT_EQ(scope, kTokenScope); ASSERT_FALSE(token_fetched_callback.is_null()); @@ -73,7 +73,7 @@ class ThirdPartyAuthenticatorTest : public AuthenticatorTestBase { virtual void ValidateThirdPartyToken( const std::string& token, - const TokenValidatedCallback& token_validated_callback) { + const TokenValidatedCallback& token_validated_callback) OVERRIDE { ASSERT_FALSE(token_validated_callback.is_null()); on_token_validated_ = token_validated_callback; } diff --git a/skia/ext/analysis_canvas_unittest.cc b/skia/ext/analysis_canvas_unittest.cc index f403a59..46c9645 100644 --- a/skia/ext/analysis_canvas_unittest.cc +++ b/skia/ext/analysis_canvas_unittest.cc @@ -23,19 +23,21 @@ namespace skia { class TestPixelRef : public SkPixelRef { public: // Pure virtual implementation. - SkFlattenable::Factory getFactory() { return NULL; } - void* onLockPixels(SkColorTable**) { return NULL; } - void onUnlockPixels() {} + virtual SkFlattenable::Factory getFactory() OVERRIDE { return NULL; } + virtual void* onLockPixels(SkColorTable**) OVERRIDE { return NULL; } + virtual void onUnlockPixels() OVERRIDE {} }; class TestLazyPixelRef : public LazyPixelRef { public: // Pure virtual implementation. - SkFlattenable::Factory getFactory() { return NULL; } - void* onLockPixels(SkColorTable**) { return NULL; } - void onUnlockPixels() {} - bool PrepareToDecode(const PrepareParams& params) { return true; } - void Decode() {} + virtual SkFlattenable::Factory getFactory() OVERRIDE { return NULL; } + virtual void* onLockPixels(SkColorTable**) OVERRIDE { return NULL; } + virtual void onUnlockPixels() OVERRIDE {} + virtual bool PrepareToDecode(const PrepareParams& params) OVERRIDE { + return true; + } + virtual void Decode() OVERRIDE {} }; class TestShader : public SkShader { @@ -44,16 +46,18 @@ class TestShader : public SkShader { : bitmap_(bitmap) { } - SkShader::BitmapType asABitmap(SkBitmap* bitmap, - SkMatrix*, TileMode xy[2]) const { + virtual SkShader::BitmapType asABitmap( + SkBitmap* bitmap, + SkMatrix*, + TileMode xy[2]) const OVERRIDE { if (bitmap) *bitmap = *bitmap_; return SkShader::kDefault_BitmapType; } // Pure virtual implementation. - void shadeSpan(int x, int y, SkPMColor[], int count) {} - SkFlattenable::Factory getFactory() { return NULL; } + virtual void shadeSpan(int x, int y, SkPMColor[], int count) OVERRIDE {} + virtual SkFlattenable::Factory getFactory() OVERRIDE { return NULL; } private: diff --git a/ui/gfx/image/image.cc b/ui/gfx/image/image.cc index 6103dcf..b076942 100644 --- a/ui/gfx/image/image.cc +++ b/ui/gfx/image/image.cc @@ -260,15 +260,15 @@ class ImageRepPNG : public ImageRep { virtual ~ImageRepPNG() { } - virtual int Width() const { + virtual int Width() const OVERRIDE { return Size().width(); } - virtual int Height() const { + virtual int Height() const OVERRIDE { return Size().height(); } - virtual gfx::Size Size() const { + virtual gfx::Size Size() const OVERRIDE { // Read the PNG data to get the image size, caching it. if (!size_cache_) { for (std::vector<ImagePNGRep>::const_iterator it = image_reps().begin(); @@ -306,15 +306,15 @@ class ImageRepSkia : public ImageRep { virtual ~ImageRepSkia() { } - virtual int Width() const { + virtual int Width() const OVERRIDE { return image_->width(); } - virtual int Height() const { + virtual int Height() const OVERRIDE { return image_->height(); } - virtual gfx::Size Size() const { + virtual gfx::Size Size() const OVERRIDE { return image_->size(); } @@ -444,15 +444,15 @@ class ImageRepCocoa : public ImageRep { image_ = nil; } - virtual int Width() const { + virtual int Width() const OVERRIDE { return Size().width(); } - virtual int Height() const { + virtual int Height() const OVERRIDE { return Size().height(); } - virtual gfx::Size Size() const { + virtual gfx::Size Size() const OVERRIDE { return internal::NSImageSize(image_); } |