replace OVERRIDE and FINAL with override and final in ui/

ui/wm/core/transient_window_manager_unittest.cc

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "ui/wm/core/transient_window_manager.h"
 
 #include "ui/aura/client/visibility_client.h"
 #include "ui/aura/client/window_tree_client.h"
 #include "ui/aura/layout_manager.h"
 #include "ui/aura/test/aura_test_base.h"
@@ skipping 16 matching lines @@
   }
 
   virtual ~TestTransientWindowObserver() {
   }
 
   int add_count() const { return add_count_; }
   int remove_count() const { return remove_count_; }
 
   // TransientWindowObserver overrides:
   virtual void OnTransientChildAdded(Window* window,
-                                     Window* transient) OVERRIDE {
+                                     Window* transient) override {
     add_count_++;
   }
   virtual void OnTransientChildRemoved(Window* window,
-                                       Window* transient) OVERRIDE {
+                                       Window* transient) override {
     remove_count_++;
   }
 
  private:
   int add_count_;
   int remove_count_;
 
   DISALLOW_COPY_AND_ASSIGN(TestTransientWindowObserver);
 };
 
 class TransientWindowManagerTest : public aura::test::AuraTestBase {
  public:
   TransientWindowManagerTest() {}
   virtual ~TransientWindowManagerTest() {}
 
-  virtual void SetUp() OVERRIDE {
+  virtual void SetUp() override {
     AuraTestBase::SetUp();
     wm_state_.reset(new wm::WMState);
   }
 
-  virtual void TearDown() OVERRIDE {
+  virtual void TearDown() override {
     wm_state_.reset();
     AuraTestBase::TearDown();
   }
 
  protected:
   // Creates a transient window that is transient to |parent|.
   Window* CreateTransientChild(int id, Window* parent) {
     Window* window = new Window(NULL);
     window->set_id(id);
     window->SetType(ui::wm::WINDOW_TYPE_NORMAL);
@@ skipping 269 matching lines @@
 
 // Used by NotifyDelegateAfterDeletingTransients. Adds a string to a vector when
 // OnWindowDestroyed() is invoked so that destruction order can be verified.
 class DestroyedTrackingDelegate : public aura::test::TestWindowDelegate {
  public:
   explicit DestroyedTrackingDelegate(const std::string& name,
                                      std::vector<std::string>* results)
       : name_(name),
         results_(results) {}
 
-  virtual void OnWindowDestroyed(aura::Window* window) OVERRIDE {
+  virtual void OnWindowDestroyed(aura::Window* window) override {
     results_->push_back(name_);
   }
 
  private:
   const std::string name_;
   std::vector<std::string>* results_;
 
   DISALLOW_COPY_AND_ASSIGN(DestroyedTrackingDelegate);
 };
 
@@ skipping 92 matching lines @@
  public:
   explicit StackingMadrigalLayoutManager(Window* root_window)
       : root_window_(root_window) {
     root_window_->SetLayoutManager(this);
   }
   virtual ~StackingMadrigalLayoutManager() {
   }
 
  private:
   // Overridden from LayoutManager:
-  virtual void OnWindowResized() OVERRIDE {}
-  virtual void OnWindowAddedToLayout(Window* child) OVERRIDE {}
-  virtual void OnWillRemoveWindowFromLayout(Window* child) OVERRIDE {}
-  virtual void OnWindowRemovedFromLayout(Window* child) OVERRIDE {}
+  virtual void OnWindowResized() override {}
+  virtual void OnWindowAddedToLayout(Window* child) override {}
+  virtual void OnWillRemoveWindowFromLayout(Window* child) override {}
+  virtual void OnWindowRemovedFromLayout(Window* child) override {}
   virtual void OnChildWindowVisibilityChanged(Window* child,
-                                              bool visible) OVERRIDE {
+                                              bool visible) override {
     Window::Windows::const_iterator it = root_window_->children().begin();
     Window* last_window = NULL;
     for (; it != root_window_->children().end(); ++it) {
       if (*it == child && last_window) {
         if (!visible)
           root_window_->StackChildAbove(last_window, *it);
         else
           root_window_->StackChildAbove(*it, last_window);
         break;
       }
       last_window = *it;
     }
   }
   virtual void SetChildBounds(Window* child,
-                              const gfx::Rect& requested_bounds) OVERRIDE {
+                              const gfx::Rect& requested_bounds) override {
     SetChildBoundsDirect(child, requested_bounds);
   }
 
   Window* root_window_;
 
   DISALLOW_COPY_AND_ASSIGN(StackingMadrigalLayoutManager);
 };
 
 class StackingMadrigalVisibilityClient : public aura::client::VisibilityClient {
  public:
   explicit StackingMadrigalVisibilityClient(Window* root_window)
       : ignored_window_(NULL) {
     aura::client::SetVisibilityClient(root_window, this);
   }
   virtual ~StackingMadrigalVisibilityClient() {
   }
 
   void set_ignored_window(Window* ignored_window) {
     ignored_window_ = ignored_window;
   }
 
  private:
   // Overridden from client::VisibilityClient:
-  virtual void UpdateLayerVisibility(Window* window, bool visible) OVERRIDE {
+  virtual void UpdateLayerVisibility(Window* window, bool visible) override {
     if (!visible) {
       if (window == ignored_window_)
         window->layer()->set_delegate(NULL);
       else
         window->layer()->SetVisible(visible);
     } else {
       window->layer()->SetVisible(visible);
     }
   }
 
@@ skipping 178 matching lines @@
   EXPECT_EQ(0, test_observer.remove_count());
 
   RemoveTransientChild(parent.get(), w1.get());
   EXPECT_EQ(1, test_observer.add_count());
   EXPECT_EQ(1, test_observer.remove_count());
 
   TransientWindowManager::Get(parent.get())->RemoveObserver(&test_observer);
 }
 
 }  // namespace wm