diff options
Diffstat (limited to 'ui')
| -rw-r--r-- | ui/gfx/image/image_mac_unittest.mm | 2 | ||||
| -rw-r--r-- | ui/shell_dialogs/select_file_dialog_mac.mm | 6 | ||||
| -rw-r--r-- | ui/surface/io_surface_support_mac.cc | 26 |
3 files changed, 17 insertions, 17 deletions
diff --git a/ui/gfx/image/image_mac_unittest.mm b/ui/gfx/image/image_mac_unittest.mm index fd38d52..7a0c3eb 100644 --- a/ui/gfx/image/image_mac_unittest.mm +++ b/ui/gfx/image/image_mac_unittest.mm @@ -78,7 +78,7 @@ class ImageMacTest : public testing::Test { : supported_scale_factors_(gfx::test::Get1xAnd2xScaleFactors()) { } - ~ImageMacTest() { + virtual ~ImageMacTest() { } private: diff --git a/ui/shell_dialogs/select_file_dialog_mac.mm b/ui/shell_dialogs/select_file_dialog_mac.mm index 6a0e838..31d7cade 100644 --- a/ui/shell_dialogs/select_file_dialog_mac.mm +++ b/ui/shell_dialogs/select_file_dialog_mac.mm @@ -65,8 +65,8 @@ class SelectFileDialogImpl : public ui::SelectFileDialog { ui::SelectFilePolicy* policy); // BaseShellDialog implementation. - virtual bool IsRunning(gfx::NativeWindow parent_window) const; - virtual void ListenerDestroyed(); + virtual bool IsRunning(gfx::NativeWindow parent_window) const OVERRIDE; + virtual void ListenerDestroyed() OVERRIDE; // Callback from ObjC bridge. void FileWasSelected(NSSavePanel* dialog, @@ -98,7 +98,7 @@ class SelectFileDialogImpl : public ui::SelectFileDialog { NSView* GetAccessoryView(const FileTypeInfo* file_types, int file_type_index); - virtual bool HasMultipleFileTypeChoicesImpl(); + virtual bool HasMultipleFileTypeChoicesImpl() OVERRIDE; // The bridge for results from Cocoa to return to us. scoped_nsobject<SelectFileDialogBridge> bridge_; diff --git a/ui/surface/io_surface_support_mac.cc b/ui/surface/io_surface_support_mac.cc index 49cc285..53376e5 100644 --- a/ui/surface/io_surface_support_mac.cc +++ b/ui/surface/io_surface_support_mac.cc @@ -34,19 +34,19 @@ class IOSurfaceSupportImpl : public IOSurfaceSupport { return initialized_successfully_; } - virtual CFStringRef GetKIOSurfaceWidth(); - virtual CFStringRef GetKIOSurfaceHeight(); - virtual CFStringRef GetKIOSurfaceBytesPerElement(); - virtual CFStringRef GetKIOSurfaceIsGlobal(); + virtual CFStringRef GetKIOSurfaceWidth() OVERRIDE; + virtual CFStringRef GetKIOSurfaceHeight() OVERRIDE; + virtual CFStringRef GetKIOSurfaceBytesPerElement() OVERRIDE; + virtual CFStringRef GetKIOSurfaceIsGlobal() OVERRIDE; - virtual CFTypeRef IOSurfaceCreate(CFDictionaryRef properties); - virtual uint32 IOSurfaceGetID(CFTypeRef io_surface); - virtual CFTypeRef IOSurfaceLookup(uint32 io_surface_id); - virtual mach_port_t IOSurfaceCreateMachPort(CFTypeRef io_surface); - virtual CFTypeRef IOSurfaceLookupFromMachPort(mach_port_t port); + virtual CFTypeRef IOSurfaceCreate(CFDictionaryRef properties) OVERRIDE; + virtual uint32 IOSurfaceGetID(CFTypeRef io_surface) OVERRIDE; + virtual CFTypeRef IOSurfaceLookup(uint32 io_surface_id) OVERRIDE; + virtual mach_port_t IOSurfaceCreateMachPort(CFTypeRef io_surface) OVERRIDE; + virtual CFTypeRef IOSurfaceLookupFromMachPort(mach_port_t port) OVERRIDE; - virtual size_t IOSurfaceGetWidth(CFTypeRef io_surface); - virtual size_t IOSurfaceGetHeight(CFTypeRef io_surface); + virtual size_t IOSurfaceGetWidth(CFTypeRef io_surface) OVERRIDE; + virtual size_t IOSurfaceGetHeight(CFTypeRef io_surface) OVERRIDE; virtual CGLError CGLTexImageIOSurface2D(CGLContextObj ctx, GLenum target, @@ -56,14 +56,14 @@ class IOSurfaceSupportImpl : public IOSurfaceSupport { GLenum format, GLenum type, CFTypeRef io_surface, - GLuint plane); + GLuint plane) OVERRIDE; virtual CFTypeRef CVPixelBufferGetIOSurface( CVPixelBufferRef pixel_buffer) OVERRIDE; private: IOSurfaceSupportImpl(); - ~IOSurfaceSupportImpl(); + virtual ~IOSurfaceSupportImpl(); void CloseLibraryHandles(); |