replace OVERRIDE and FINAL with override and final in ui/

BUG=417463

Review URL: https://codereview.chromium.org/623293004

Cr-Commit-Position: refs/heads/master@{#298839}

4 files changed, 17 insertions, 17 deletions

diff --git a/ui/base/cursor/cursor_loader_ozone.h b/ui/base/cursor/cursor_loader_ozone.h
index 402cdc2..7aef431 100644
--- a/ui/base/cursor/cursor_loader_ozone.h
+++ b/ui/base/cursor/cursor_loader_ozone.h
@@ -20,13 +20,13 @@ class UI_BASE_EXPORT CursorLoaderOzone : public CursorLoader {
   // CursorLoader overrides:
   virtual void LoadImageCursor(int id,
                                int resource_id,
-                               const gfx::Point& hot) OVERRIDE;
+                               const gfx::Point& hot) override;
   virtual void LoadAnimatedCursor(int id,
                                   int resource_id,
                                   const gfx::Point& hot,
-                                  int frame_delay_ms) OVERRIDE;
-  virtual void UnloadAll() OVERRIDE;
-  virtual void SetPlatformCursor(gfx::NativeCursor* cursor) OVERRIDE;
+                                  int frame_delay_ms) override;
+  virtual void UnloadAll() override;
+  virtual void SetPlatformCursor(gfx::NativeCursor* cursor) override;
 
  private:
   // Pointers are owned by ResourceBundle and must not be freed here.
diff --git a/ui/base/cursor/cursor_loader_win.h b/ui/base/cursor/cursor_loader_win.h
index adcc0ae..c886af0 100644
--- a/ui/base/cursor/cursor_loader_win.h
+++ b/ui/base/cursor/cursor_loader_win.h
@@ -18,13 +18,13 @@ class UI_BASE_EXPORT CursorLoaderWin : public CursorLoader {
   // Overridden from CursorLoader:
   virtual void LoadImageCursor(int id,
                                int resource_id,
-                               const gfx::Point& hot) OVERRIDE;
+                               const gfx::Point& hot) override;
   virtual void LoadAnimatedCursor(int id,
                                   int resource_id,
                                   const gfx::Point& hot,
-                                  int frame_delay_ms) OVERRIDE;
-  virtual void UnloadAll() OVERRIDE;
-  virtual void SetPlatformCursor(gfx::NativeCursor* cursor) OVERRIDE;
+                                  int frame_delay_ms) override;
+  virtual void UnloadAll() override;
+  virtual void SetPlatformCursor(gfx::NativeCursor* cursor) override;
 
   // Used to pass the cursor resource module name to the cursor loader. This is
   // typically used to load non system cursors.
diff --git a/ui/base/cursor/cursor_loader_x11.h b/ui/base/cursor/cursor_loader_x11.h
index 331529b..2667221 100644
--- a/ui/base/cursor/cursor_loader_x11.h
+++ b/ui/base/cursor/cursor_loader_x11.h
@@ -25,13 +25,13 @@ class UI_BASE_EXPORT CursorLoaderX11 : public CursorLoader {
   // Overridden from CursorLoader:
   virtual void LoadImageCursor(int id,
                                int resource_id,
-                               const gfx::Point& hot) OVERRIDE;
+                               const gfx::Point& hot) override;
   virtual void LoadAnimatedCursor(int id,
                                   int resource_id,
                                   const gfx::Point& hot,
-                                  int frame_delay_ms) OVERRIDE;
-  virtual void UnloadAll() OVERRIDE;
-  virtual void SetPlatformCursor(gfx::NativeCursor* cursor) OVERRIDE;
+                                  int frame_delay_ms) override;
+  virtual void UnloadAll() override;
+  virtual void SetPlatformCursor(gfx::NativeCursor* cursor) override;
 
   const XcursorImage* GetXcursorImageForTest(int id);
 
diff --git a/ui/base/cursor/ozone/bitmap_cursor_factory_ozone.h b/ui/base/cursor/ozone/bitmap_cursor_factory_ozone.h
index dc51602..037fd08 100644
--- a/ui/base/cursor/ozone/bitmap_cursor_factory_ozone.h
+++ b/ui/base/cursor/ozone/bitmap_cursor_factory_ozone.h
@@ -60,15 +60,15 @@ class UI_BASE_EXPORT BitmapCursorFactoryOzone : public CursorFactoryOzone {
       PlatformCursor platform_cursor);
 
   // CursorFactoryOzone:
-  virtual PlatformCursor GetDefaultCursor(int type) OVERRIDE;
+  virtual PlatformCursor GetDefaultCursor(int type) override;
   virtual PlatformCursor CreateImageCursor(const SkBitmap& bitmap,
-                                           const gfx::Point& hotspot) OVERRIDE;
+                                           const gfx::Point& hotspot) override;
   virtual PlatformCursor CreateAnimatedCursor(
       const std::vector<SkBitmap>& bitmaps,
       const gfx::Point& hotspot,
-      int frame_delay_ms) OVERRIDE;
-  virtual void RefImageCursor(PlatformCursor cursor) OVERRIDE;
-  virtual void UnrefImageCursor(PlatformCursor cursor) OVERRIDE;
+      int frame_delay_ms) override;
+  virtual void RefImageCursor(PlatformCursor cursor) override;
+  virtual void UnrefImageCursor(PlatformCursor cursor) override;
 
  private:
   // Get cached BitmapCursorOzone for a default cursor.