Mojo: Convert the remaining OVERRIDEs to override in mojo/.

mojo/examples/wm_flow/wm/frame_controller.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 "mojo/examples/wm_flow/wm/frame_controller.h"
 
+#include "base/macros.h"
 #include "base/strings/utf_string_conversions.h"
 #include "mojo/services/public/cpp/view_manager/view.h"
 #include "mojo/services/window_manager/window_manager_app.h"
 #include "mojo/views/native_widget_view_manager.h"
 #include "ui/views/background.h"
 #include "ui/views/controls/button/label_button.h"
 #include "ui/views/layout/layout_manager.h"
 #include "ui/views/widget/widget.h"
 #include "ui/wm/public/activation_client.h"
 
 class FrameController::LayoutManager : public views::LayoutManager,
                                        public views::ButtonListener {
  public:
   explicit LayoutManager(FrameController* controller)
       : controller_(controller),
         close_button_(
             new views::LabelButton(this, base::ASCIIToUTF16("Begone"))),
         maximize_button_(
             new views::LabelButton(this, base::ASCIIToUTF16("Embiggen"))) {}
   virtual ~LayoutManager() {}
 
  private:
   static const int kButtonFrameMargin = 5;
   static const int kButtonFrameSpacing = 2;
   static const int kFrameSize = 10;
 
   // Overridden from views::LayoutManager:
-  virtual void Installed(views::View* host) OVERRIDE {
+  virtual void Installed(views::View* host) override {
     host->AddChildView(close_button_);
     host->AddChildView(maximize_button_);
   }
-  virtual void Layout(views::View* host) OVERRIDE {
+  virtual void Layout(views::View* host) override {
     gfx::Size ps = close_button_->GetPreferredSize();
     gfx::Rect bounds = host->GetLocalBounds();
     close_button_->SetBounds(bounds.right() - kButtonFrameMargin - ps.width(),
                              kButtonFrameMargin, ps.width(), ps.height());
 
     ps = maximize_button_->GetPreferredSize();
     maximize_button_->SetBounds(
         close_button_->x() - kButtonFrameSpacing - ps.width(),
         kButtonFrameMargin, ps.width(), ps.height());
 
     bounds.Inset(kFrameSize,
                  close_button_->bounds().bottom() + kButtonFrameMargin,
                  kFrameSize, kFrameSize);
     controller_->app_view_->SetBounds(bounds);
   }
-  virtual gfx::Size GetPreferredSize(const views::View* host) const OVERRIDE {
+  virtual gfx::Size GetPreferredSize(const views::View* host) const override {
     return gfx::Size();
   }
 
   // Overridden from views::ButtonListener:
   virtual void ButtonPressed(views::Button* sender,
-                             const ui::Event& event) OVERRIDE {
+                             const ui::Event& event) override {
     if (sender == close_button_)
       controller_->CloseWindow();
     else if (sender == maximize_button_)
       controller_->ToggleMaximize();
   }
 
   FrameController* controller_;
   views::Button* close_button_;
   views::Button* maximize_button_;
 
   DISALLOW_COPY_AND_ASSIGN(LayoutManager);
 };
 
 class FrameController::FrameEventHandler : public ui::EventHandler {
  public:
   explicit FrameEventHandler(FrameController* frame_controller)
       : frame_controller_(frame_controller) {}
   virtual ~FrameEventHandler() {}
 
  private:
 
   // Overriden from ui::EventHandler:
-  virtual void OnMouseEvent(ui::MouseEvent* event) OVERRIDE {
+  virtual void OnMouseEvent(ui::MouseEvent* event) override {
     if (event->type() == ui::ET_MOUSE_PRESSED)
       frame_controller_->ActivateWindow();
   }
 
   FrameController* frame_controller_;
 
   DISALLOW_COPY_AND_ASSIGN(FrameEventHandler);
 };
 
 ////////////////////////////////////////////////////////////////////////////////
@@ skipping 51 matching lines @@
   activation_client_->ActivateWindow(window);
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // FrameController, mojo::ViewObserver implementation:
 
 void FrameController::OnViewDestroyed(mojo::View* view) {
   view_->RemoveObserver(this);
   delete this;
 }