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

mojo/examples/aura_demo/aura_demo.cc

 // Copyright 2013 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 <stdio.h>
 #include <string>
 
 #include "base/bind.h"
+#include "base/macros.h"
 #include "mojo/application/application_runner_chromium.h"
 #include "mojo/aura/context_factory_mojo.h"
 #include "mojo/aura/screen_mojo.h"
 #include "mojo/aura/window_tree_host_mojo.h"
 #include "mojo/aura/window_tree_host_mojo_delegate.h"
 #include "mojo/public/c/system/main.h"
 #include "mojo/public/cpp/application/application_connection.h"
 #include "mojo/public/cpp/application/application_delegate.h"
 #include "mojo/public/cpp/application/application_impl.h"
 #include "mojo/public/cpp/system/core.h"
@@ skipping 12 matching lines @@
 #include "ui/gfx/codec/png_codec.h"
 
 namespace examples {
 
 // Trivial WindowDelegate implementation that draws a colored background.
 class DemoWindowDelegate : public aura::WindowDelegate {
  public:
   explicit DemoWindowDelegate(SkColor color) : color_(color) {}
 
   // Overridden from WindowDelegate:
-  virtual gfx::Size GetMinimumSize() const OVERRIDE {
+  virtual gfx::Size GetMinimumSize() const override {
     return gfx::Size();
   }
 
-  virtual gfx::Size GetMaximumSize() const OVERRIDE {
+  virtual gfx::Size GetMaximumSize() const override {
     return gfx::Size();
   }
 
   virtual void OnBoundsChanged(const gfx::Rect& old_bounds,
-                               const gfx::Rect& new_bounds) OVERRIDE {}
-  virtual gfx::NativeCursor GetCursor(const gfx::Point& point) OVERRIDE {
+                               const gfx::Rect& new_bounds) override {}
+  virtual gfx::NativeCursor GetCursor(const gfx::Point& point) override {
     return gfx::kNullCursor;
   }
-  virtual int GetNonClientComponent(const gfx::Point& point) const OVERRIDE {
+  virtual int GetNonClientComponent(const gfx::Point& point) const override {
     return HTCAPTION;
   }
   virtual bool ShouldDescendIntoChildForEventHandling(
       aura::Window* child,
-      const gfx::Point& location) OVERRIDE {
+      const gfx::Point& location) override {
     return true;
   }
-  virtual bool CanFocus() OVERRIDE { return true; }
-  virtual void OnCaptureLost() OVERRIDE {}
-  virtual void OnPaint(gfx::Canvas* canvas) OVERRIDE {
+  virtual bool CanFocus() override { return true; }
+  virtual void OnCaptureLost() override {}
+  virtual void OnPaint(gfx::Canvas* canvas) override {
     canvas->DrawColor(color_, SkXfermode::kSrc_Mode);
   }
-  virtual void OnDeviceScaleFactorChanged(float device_scale_factor) OVERRIDE {}
-  virtual void OnWindowDestroying(aura::Window* window) OVERRIDE {}
-  virtual void OnWindowDestroyed(aura::Window* window) OVERRIDE {}
-  virtual void OnWindowTargetVisibilityChanged(bool visible) OVERRIDE {}
-  virtual bool HasHitTestMask() const OVERRIDE { return false; }
-  virtual void GetHitTestMask(gfx::Path* mask) const OVERRIDE {}
+  virtual void OnDeviceScaleFactorChanged(float device_scale_factor) override {}
+  virtual void OnWindowDestroying(aura::Window* window) override {}
+  virtual void OnWindowDestroyed(aura::Window* window) override {}
+  virtual void OnWindowTargetVisibilityChanged(bool visible) override {}
+  virtual bool HasHitTestMask() const override { return false; }
+  virtual void GetHitTestMask(gfx::Path* mask) const override {}
 
  private:
   const SkColor color_;
 
   DISALLOW_COPY_AND_ASSIGN(DemoWindowDelegate);
 };
 
 class DemoWindowTreeClient : public aura::client::WindowTreeClient {
  public:
   explicit DemoWindowTreeClient(aura::Window* window) : window_(window) {
     aura::client::SetWindowTreeClient(window_, this);
   }
 
   virtual ~DemoWindowTreeClient() {
     aura::client::SetWindowTreeClient(window_, NULL);
   }
 
   // Overridden from aura::client::WindowTreeClient:
   virtual aura::Window* GetDefaultParent(aura::Window* context,
                                          aura::Window* window,
-                                         const gfx::Rect& bounds) OVERRIDE {
+                                         const gfx::Rect& bounds) override {
     if (!capture_client_) {
       capture_client_.reset(
           new aura::client::DefaultCaptureClient(window_->GetRootWindow()));
     }
     return window_;
   }
 
  private:
   aura::Window* window_;
   scoped_ptr<aura::client::DefaultCaptureClient> capture_client_;
 
   DISALLOW_COPY_AND_ASSIGN(DemoWindowTreeClient);
 };
 
 class AuraDemo : public mojo::ApplicationDelegate,
                  public mojo::WindowTreeHostMojoDelegate,
                  public mojo::ViewManagerDelegate {
  public:
   AuraDemo() : window1_(NULL), window2_(NULL), window21_(NULL) {}
   virtual ~AuraDemo() {}
 
  private:
   // Overridden from ViewManagerDelegate:
   virtual void OnEmbed(
       mojo::ViewManager* view_manager,
       mojo::View* root,
       mojo::ServiceProviderImpl* exported_services,
-      scoped_ptr<mojo::ServiceProvider> imported_services) OVERRIDE {
+      scoped_ptr<mojo::ServiceProvider> imported_services) override {
     // TODO(beng): this function could be called multiple times!
     root_ = root;
 
     window_tree_host_.reset(new mojo::WindowTreeHostMojo(root, this));
     window_tree_host_->InitHost();
 
     window_tree_client_.reset(
         new DemoWindowTreeClient(window_tree_host_->window()));
 
     delegate1_.reset(new DemoWindowDelegate(SK_ColorBLUE));
@@ skipping 13 matching lines @@
     delegate21_.reset(new DemoWindowDelegate(SK_ColorGREEN));
     window21_ = new aura::Window(delegate21_.get());
     window21_->Init(aura::WINDOW_LAYER_TEXTURED);
     window21_->SetBounds(gfx::Rect(10, 10, 50, 50));
     window21_->Show();
     window2_->AddChild(window21_);
 
     window_tree_host_->Show();
   }
   virtual void OnViewManagerDisconnected(
-      mojo::ViewManager* view_manager) OVERRIDE {
+      mojo::ViewManager* view_manager) override {
     base::MessageLoop::current()->Quit();
   }
 
   // WindowTreeHostMojoDelegate:
-  virtual void CompositorContentsChanged(const SkBitmap& bitmap) OVERRIDE {
+  virtual void CompositorContentsChanged(const SkBitmap& bitmap) override {
     root_->SetContents(bitmap);
   }
 
   virtual void Initialize(mojo::ApplicationImpl* app) override {
     view_manager_client_factory_.reset(
         new mojo::ViewManagerClientFactory(app->shell(), this));
     aura::Env::CreateInstance(true);
     context_factory_.reset(new mojo::ContextFactoryMojo);
     aura::Env::GetInstance()->set_context_factory(context_factory_.get());
     screen_.reset(mojo::ScreenMojo::Create());
@@ skipping 28 matching lines @@
 
   DISALLOW_COPY_AND_ASSIGN(AuraDemo);
 };
 
 }  // namespace examples
 
 MojoResult MojoMain(MojoHandle shell_handle) {
   mojo::ApplicationRunnerChromium runner(new examples::AuraDemo);
   return runner.Run(shell_handle);
 }