diff options
author | dcheng <dcheng@chromium.org> | 2015-01-08 18:05:34 -0800 |
---|---|---|
committer | Commit bot <commit-bot@chromium.org> | 2015-01-09 02:06:36 +0000 |
commit | 601353353b75947e9962a2386d053ea7fc41cacf (patch) | |
tree | 9bc9bc65fa44cda102205272802f6c39f5fd176d | |
parent | 03b14436cff53ba44e535e2c5950f75a09bce9b9 (diff) | |
download | chromium_src-601353353b75947e9962a2386d053ea7fc41cacf.zip chromium_src-601353353b75947e9962a2386d053ea7fc41cacf.tar.gz chromium_src-601353353b75947e9962a2386d053ea7fc41cacf.tar.bz2 |
Update {virtual,override,final} for content/ to follow C++11 style.
This patch was automatically generated using a variation of
https://codereview.chromium.org/598073004 on a Mac build.
BUG=417463
Review URL: https://codereview.chromium.org/839453004
Cr-Commit-Position: refs/heads/master@{#310665}
9 files changed, 13 insertions, 13 deletions
diff --git a/content/browser/accessibility/accessibility_event_recorder_mac.mm b/content/browser/accessibility/accessibility_event_recorder_mac.mm index 7c548f7..95967f43 100644 --- a/content/browser/accessibility/accessibility_event_recorder_mac.mm +++ b/content/browser/accessibility/accessibility_event_recorder_mac.mm @@ -23,7 +23,7 @@ namespace content { class AccessibilityEventRecorderMac : public AccessibilityEventRecorder { public: explicit AccessibilityEventRecorderMac(BrowserAccessibilityManager* manager); - virtual ~AccessibilityEventRecorderMac(); + ~AccessibilityEventRecorderMac() override; // Callback executed every time we receive an event notification. void EventReceived(AXUIElementRef element, CFStringRef notification); diff --git a/content/browser/accessibility/browser_accessibility_mac_unittest.mm b/content/browser/accessibility/browser_accessibility_mac_unittest.mm index 11388c8..34874e3 100644 --- a/content/browser/accessibility/browser_accessibility_mac_unittest.mm +++ b/content/browser/accessibility/browser_accessibility_mac_unittest.mm @@ -18,7 +18,7 @@ namespace content { class BrowserAccessibilityTest : public ui::CocoaTest { public: - virtual void SetUp() { + void SetUp() override { CocoaTest::SetUp(); RebuildAccessibilityTree(); } diff --git a/content/browser/cocoa/system_hotkey_map_unittest.mm b/content/browser/cocoa/system_hotkey_map_unittest.mm index 6b2652f..37638d4 100644 --- a/content/browser/cocoa/system_hotkey_map_unittest.mm +++ b/content/browser/cocoa/system_hotkey_map_unittest.mm @@ -56,7 +56,7 @@ class SystemHotkeyMapTest : public ::testing::Test { ++count_; } - virtual void SetUp() override { + void SetUp() override { system_hotkey_dictionary_.reset([[NSMutableDictionary alloc] init]); system_hotkey_inner_dictionary_.reset([[NSMutableDictionary alloc] init]); [system_hotkey_dictionary_ setObject:system_hotkey_inner_dictionary_ @@ -64,7 +64,7 @@ class SystemHotkeyMapTest : public ::testing::Test { count_ = 100; } - virtual void TearDown() override { + void TearDown() override { system_hotkey_dictionary_.reset(); system_hotkey_inner_dictionary_.reset(); } diff --git a/content/browser/renderer_host/render_widget_host_view_mac_editcommand_helper_unittest.mm b/content/browser/renderer_host/render_widget_host_view_mac_editcommand_helper_unittest.mm index 6ecb669..09539ed 100644 --- a/content/browser/renderer_host/render_widget_host_view_mac_editcommand_helper_unittest.mm +++ b/content/browser/renderer_host/render_widget_host_view_mac_editcommand_helper_unittest.mm @@ -97,14 +97,14 @@ class RenderWidgetHostEditCommandCounter : public RenderWidgetHostImpl { class RenderWidgetHostViewMacEditCommandHelperTest : public PlatformTest { protected: - virtual void SetUp() { + void SetUp() override { if (IsDelegatedRendererEnabled()) { ImageTransportFactory::InitializeForUnitTests( scoped_ptr<ImageTransportFactory>( new NoTransportImageTransportFactory)); } } - virtual void TearDown() { + void TearDown() override { if (IsDelegatedRendererEnabled()) ImageTransportFactory::Terminate(); } diff --git a/content/browser/renderer_host/render_widget_host_view_mac_unittest.mm b/content/browser/renderer_host/render_widget_host_view_mac_unittest.mm index 685039a..21935c6 100644 --- a/content/browser/renderer_host/render_widget_host_view_mac_unittest.mm +++ b/content/browser/renderer_host/render_widget_host_view_mac_unittest.mm @@ -166,7 +166,7 @@ class RenderWidgetHostViewMacTest : public RenderViewHostImplTestHarness { public: RenderWidgetHostViewMacTest() : old_rwhv_(NULL), rwhv_mac_(NULL) {} - virtual void SetUp() { + void SetUp() override { RenderViewHostImplTestHarness::SetUp(); if (IsDelegatedRendererEnabled()) { ImageTransportFactory::InitializeForUnitTests( @@ -183,7 +183,7 @@ class RenderWidgetHostViewMacTest : public RenderViewHostImplTestHarness { rwhv_mac_ = new RenderWidgetHostViewMac(rvh(), false); rwhv_cocoa_.reset([rwhv_mac_->cocoa_view() retain]); } - virtual void TearDown() { + void TearDown() override { // Make sure the rwhv_mac_ is gone once the superclass's |TearDown()| runs. rwhv_cocoa_.reset(); RecycleAndWait(); diff --git a/content/browser/web_contents/web_drag_dest_mac_unittest.mm b/content/browser/web_contents/web_drag_dest_mac_unittest.mm index 90c565c..d0657f5 100644 --- a/content/browser/web_contents/web_drag_dest_mac_unittest.mm +++ b/content/browser/web_contents/web_drag_dest_mac_unittest.mm @@ -27,7 +27,7 @@ NSString* const kCrCorePasteboardFlavorType_urln = class WebDragDestTest : public RenderViewHostImplTestHarness { public: - virtual void SetUp() { + void SetUp() override { RenderViewHostImplTestHarness::SetUp(); drag_dest_.reset([[WebDragDest alloc] initWithWebContentsImpl:contents()]); } diff --git a/content/common/gpu/gpu_memory_buffer_factory_io_surface.h b/content/common/gpu/gpu_memory_buffer_factory_io_surface.h index 0fe8681..eac05ad 100644 --- a/content/common/gpu/gpu_memory_buffer_factory_io_surface.h +++ b/content/common/gpu/gpu_memory_buffer_factory_io_surface.h @@ -26,7 +26,7 @@ class GpuMemoryBufferFactoryIOSurface : public GpuMemoryBufferFactory, public gpu::ImageFactory { public: GpuMemoryBufferFactoryIOSurface(); - ~GpuMemoryBufferFactoryIOSurface(); + ~GpuMemoryBufferFactoryIOSurface() override; static bool IsGpuMemoryBufferConfigurationSupported( gfx::GpuMemoryBuffer::Format format, diff --git a/content/common/plugin_list_unittest.cc b/content/common/plugin_list_unittest.cc index 859ac13..4b8150b 100644 --- a/content/common/plugin_list_unittest.cc +++ b/content/common/plugin_list_unittest.cc @@ -51,7 +51,7 @@ class PluginListTest : public testing::Test { base::ASCIIToUTF16("bar")) { } - virtual void SetUp() { + void SetUp() override { plugin_list_.DisablePluginsDiscovery(); plugin_list_.RegisterInternalPlugin(bar_plugin_, false); foo_plugin_.mime_types.push_back( diff --git a/content/renderer/external_popup_menu_browsertest.cc b/content/renderer/external_popup_menu_browsertest.cc index b3fecbb..0cd2ddb 100644 --- a/content/renderer/external_popup_menu_browsertest.cc +++ b/content/renderer/external_popup_menu_browsertest.cc @@ -33,7 +33,7 @@ class ExternalPopupMenuTest : public RenderViewTest { return view()->GetMainRenderFrame(); } - virtual void SetUp() { + void SetUp() override { RenderViewTest::SetUp(); // We need to set this explictly as RenderMain is not run. blink::WebView::setUseExternalPopupMenus(true); @@ -154,7 +154,7 @@ class ExternalPopupMenuDisplayNoneTest : public ExternalPopupMenuTest { public: ExternalPopupMenuDisplayNoneTest() {} - virtual void SetUp() { + void SetUp() override { RenderViewTest::SetUp(); // We need to set this explictly as RenderMain is not run. blink::WebView::setUseExternalPopupMenus(true); |