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

mojo/examples/png_viewer/png_viewer.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 <algorithm>
 
+#include "base/macros.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/message_loop/message_loop.h"
 #include "base/strings/string_tokenizer.h"
 #include "mojo/application/application_runner_chromium.h"
 #include "mojo/examples/media_viewer/media_viewer.mojom.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/application/interface_factory_impl.h"
@@ skipping 50 matching lines @@
 
   virtual ~PNGView() {
     if (root_)
       root_->RemoveObserver(this);
   }
 
   // Overridden from ViewManagerDelegate:
   virtual void OnEmbed(ViewManager* view_manager,
                        View* root,
                        ServiceProviderImpl* exported_services,
-                       scoped_ptr<ServiceProvider> imported_services) OVERRIDE {
+                       scoped_ptr<ServiceProvider> imported_services) override {
     root_ = root;
     root_->AddObserver(this);
     root_->SetColor(SK_ColorGRAY);
     if (!bitmap_.isNull())
       DrawBitmap();
   }
 
-  virtual void OnViewManagerDisconnected(ViewManager* view_manager) OVERRIDE {
+  virtual void OnViewManagerDisconnected(ViewManager* view_manager) override {
     // TODO(aa): Need to figure out how shutdown works.
   }
 
   // Overridden from ViewObserver:
   virtual void OnViewBoundsChanged(View* view,
                                    const gfx::Rect& old_bounds,
-                                   const gfx::Rect& new_bounds) OVERRIDE {
+                                   const gfx::Rect& new_bounds) override {
     DCHECK_EQ(view, root_);
     DrawBitmap();
   }
 
-  virtual void OnViewDestroyed(View* view) OVERRIDE {
+  virtual void OnViewDestroyed(View* view) override {
     DCHECK_EQ(view, root_);
     delete this;
   }
 
   void DecodePNG(URLResponsePtr response) {
     int content_length = GetContentLength(response->headers);
     scoped_ptr<unsigned char[]> data(new unsigned char[content_length]);
     unsigned char* buf = data.get();
     uint32_t bytes_remaining = content_length;
     uint32_t num_bytes = bytes_remaining;
@@ skipping 80 matching lines @@
 class ContentHandlerImpl : public InterfaceImpl<ContentHandler> {
  public:
   explicit ContentHandlerImpl(Shell* shell) : shell_(shell) {}
   virtual ~ContentHandlerImpl() {}
 
  private:
   // Overridden from ContentHandler:
   virtual void OnConnect(
       const mojo::String& url,
       URLResponsePtr response,
-      InterfaceRequest<ServiceProvider> service_provider) OVERRIDE {
+      InterfaceRequest<ServiceProvider> service_provider) override {
     ServiceProviderImpl* exported_services = new ServiceProviderImpl();
     BindToRequest(exported_services, &service_provider);
     scoped_ptr<ServiceProvider> remote(
         exported_services->CreateRemoteServiceProvider());
     PNGView::Spawn(response.Pass(), exported_services, remote.Pass(), shell_);
   }
 
   Shell* shell_;
 
   DISALLOW_COPY_AND_ASSIGN(ContentHandlerImpl);
@@ skipping 23 matching lines @@
   DISALLOW_COPY_AND_ASSIGN(PNGViewer);
 };
 
 }  // namespace examples
 }  // namespace mojo
 
 MojoResult MojoMain(MojoHandle shell_handle) {
   mojo::ApplicationRunnerChromium runner(new mojo::examples::PNGViewer);
   return runner.Run(shell_handle);
 }