replace OVERRIDE and FINAL with override and final in chrome/browser/ui/[w-z]*

BUG=417463

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

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

5 files changed, 24 insertions, 24 deletions

diff --git a/chrome/browser/ui/window_sizer/window_sizer.cc b/chrome/browser/ui/window_sizer/window_sizer.cc
index c211232..46fa593 100644
--- a/chrome/browser/ui/window_sizer/window_sizer.cc
+++ b/chrome/browser/ui/window_sizer/window_sizer.cc
@@ -45,7 +45,7 @@ class DefaultStateProvider : public WindowSizer::StateProvider {
   virtual bool GetPersistentState(
       gfx::Rect* bounds,
       gfx::Rect* work_area,
-      ui::WindowShowState* show_state) const OVERRIDE {
+      ui::WindowShowState* show_state) const override {
     DCHECK(bounds);
     DCHECK(show_state);
 
@@ -87,7 +87,7 @@ class DefaultStateProvider : public WindowSizer::StateProvider {
 
   virtual bool GetLastActiveWindowState(
       gfx::Rect* bounds,
-      ui::WindowShowState* show_state) const OVERRIDE {
+      ui::WindowShowState* show_state) const override {
     DCHECK(show_state);
     // Applications are always restored with the same position.
     if (!app_name_.empty())
@@ -145,7 +145,7 @@ class DefaultTargetDisplayProvider : public WindowSizer::TargetDisplayProvider {
 
   virtual gfx::Display GetTargetDisplay(
       const gfx::Screen* screen,
-      const gfx::Rect& bounds) const OVERRIDE {
+      const gfx::Rect& bounds) const override {
 #if defined(USE_ASH)
     bool force_ash = false;
     // On Windows check if the browser is launched to serve ASH. If yes then
diff --git a/chrome/browser/ui/window_sizer/window_sizer_ash_uitest.cc b/chrome/browser/ui/window_sizer/window_sizer_ash_uitest.cc
index 5e1e389..517026a 100644
--- a/chrome/browser/ui/window_sizer/window_sizer_ash_uitest.cc
+++ b/chrome/browser/ui/window_sizer/window_sizer_ash_uitest.cc
@@ -27,7 +27,7 @@ class WindowSizerTest : public InProcessBrowserTest {
   WindowSizerTest() {}
   virtual ~WindowSizerTest() {}
 
-  virtual void SetUpCommandLine(CommandLine* command_line) OVERRIDE {
+  virtual void SetUpCommandLine(CommandLine* command_line) override {
     InProcessBrowserTest::SetUpCommandLine(command_line);
     // Make screens sufficiently wide to host 2 browsers side by side.
     command_line->AppendSwitchASCII("ash-host-window-bounds",
diff --git a/chrome/browser/ui/window_sizer/window_sizer_ash_unittest.cc b/chrome/browser/ui/window_sizer/window_sizer_ash_unittest.cc
index 280a946..0bde274 100644
--- a/chrome/browser/ui/window_sizer/window_sizer_ash_unittest.cc
+++ b/chrome/browser/ui/window_sizer/window_sizer_ash_unittest.cc
@@ -41,21 +41,21 @@ class TestBrowserWindowAura : public TestBrowserWindow {
   virtual ~TestBrowserWindowAura() {}
 
   // TestBrowserWindow overrides:
-  virtual void Show() OVERRIDE {
+  virtual void Show() override {
     native_window_->Show();
     Activate();
   }
-  virtual void Hide() OVERRIDE {
+  virtual void Hide() override {
     native_window_->Hide();
   }
-  virtual void Activate() OVERRIDE {
+  virtual void Activate() override {
     aura::client::GetActivationClient(
         native_window_->GetRootWindow())->ActivateWindow(native_window_.get());
   }
-  virtual gfx::NativeWindow GetNativeWindow() OVERRIDE {
+  virtual gfx::NativeWindow GetNativeWindow() override {
     return native_window_.get();
   }
-  virtual gfx::Rect GetBounds() const OVERRIDE {
+  virtual gfx::Rect GetBounds() const override {
     return native_window_->bounds();
   }
 
diff --git a/chrome/browser/ui/window_sizer/window_sizer_common_unittest.cc b/chrome/browser/ui/window_sizer/window_sizer_common_unittest.cc
index 323ed82..38c4263 100644
--- a/chrome/browser/ui/window_sizer/window_sizer_common_unittest.cc
+++ b/chrome/browser/ui/window_sizer/window_sizer_common_unittest.cc
@@ -25,37 +25,37 @@ class TestScreen : public gfx::Screen {
   virtual ~TestScreen() {}
 
   // Overridden from gfx::Screen:
-  virtual bool IsDIPEnabled() OVERRIDE {
+  virtual bool IsDIPEnabled() override {
     NOTREACHED();
     return false;
   }
 
-  virtual gfx::Point GetCursorScreenPoint() OVERRIDE {
+  virtual gfx::Point GetCursorScreenPoint() override {
     NOTREACHED();
     return gfx::Point();
   }
 
-  virtual gfx::NativeWindow GetWindowUnderCursor() OVERRIDE {
+  virtual gfx::NativeWindow GetWindowUnderCursor() override {
     NOTREACHED();
     return NULL;
   }
 
   virtual gfx::NativeWindow GetWindowAtScreenPoint(const gfx::Point& point)
-      OVERRIDE {
+      override {
     NOTREACHED();
     return NULL;
   }
 
-  virtual int GetNumDisplays() const OVERRIDE {
+  virtual int GetNumDisplays() const override {
     return displays_.size();
   }
 
-  virtual std::vector<gfx::Display> GetAllDisplays() const OVERRIDE {
+  virtual std::vector<gfx::Display> GetAllDisplays() const override {
     return displays_;
   }
 
   virtual gfx::Display GetDisplayNearestWindow(
-      gfx::NativeView view) const OVERRIDE {
+      gfx::NativeView view) const override {
 #if defined(USE_AURA)
     return GetDisplayMatching(view->GetBoundsInScreen());
 #else
@@ -65,13 +65,13 @@ class TestScreen : public gfx::Screen {
   }
 
   virtual gfx::Display GetDisplayNearestPoint(
-      const gfx::Point& point) const OVERRIDE {
+      const gfx::Point& point) const override {
     NOTREACHED();
     return gfx::Display();
   }
 
   virtual gfx::Display GetDisplayMatching(
-      const gfx::Rect& match_rect) const OVERRIDE {
+      const gfx::Rect& match_rect) const override {
     int max_area = 0;
     size_t max_area_index = 0;
 
@@ -87,15 +87,15 @@ class TestScreen : public gfx::Screen {
     return displays_[max_area_index];
   }
 
-  virtual gfx::Display GetPrimaryDisplay() const OVERRIDE {
+  virtual gfx::Display GetPrimaryDisplay() const override {
     return displays_[0];
   }
 
-  virtual void AddObserver(gfx::DisplayObserver* observer) OVERRIDE {
+  virtual void AddObserver(gfx::DisplayObserver* observer) override {
     NOTREACHED();
   }
 
-  virtual void RemoveObserver(gfx::DisplayObserver* observer) OVERRIDE {
+  virtual void RemoveObserver(gfx::DisplayObserver* observer) override {
     NOTREACHED();
   }
 
@@ -119,7 +119,7 @@ public:
 
   virtual gfx::Display GetTargetDisplay(
       const gfx::Screen* screen,
-      const gfx::Rect& bounds) const OVERRIDE {
+      const gfx::Rect& bounds) const override {
     // On ash, the bounds is used as a indicator to specify
     // the target display.
     return screen->GetDisplayMatching(bounds);
diff --git a/chrome/browser/ui/window_sizer/window_sizer_common_unittest.h b/chrome/browser/ui/window_sizer/window_sizer_common_unittest.h
index f2c4fb6..d2b0aa3 100644
--- a/chrome/browser/ui/window_sizer/window_sizer_common_unittest.h
+++ b/chrome/browser/ui/window_sizer/window_sizer_common_unittest.h
@@ -66,10 +66,10 @@ class TestStateProvider : public WindowSizer::StateProvider {
   virtual bool GetPersistentState(
       gfx::Rect* bounds,
       gfx::Rect* saved_work_area,
-      ui::WindowShowState* show_state) const OVERRIDE;
+      ui::WindowShowState* show_state) const override;
   virtual bool GetLastActiveWindowState(
       gfx::Rect* bounds,
-      ui::WindowShowState* show_state) const OVERRIDE;
+      ui::WindowShowState* show_state) const override;
 
  private:
   gfx::Rect persistent_bounds_;