Chromium roll (https://codereview.chromium.org/976353002)

examples/wm_flow/app/app.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 <map>
 
 #include "base/bind.h"
 #include "base/macros.h"
 #include "base/stl_util.h"
 #include "examples/bitmap_uploader/bitmap_uploader.h"
@@ skipping 67 matching lines @@
 
 // This app starts its life via Connect() rather than by being embed, so it does
 // not start with a connection to the ViewManager service. It has to obtain a
 // connection by connecting to the ViewManagerInit service and asking to be
 // embed without a view context.
 class WMFlowApp : public mojo::ApplicationDelegate,
                   public mojo::ViewManagerDelegate,
                   public mojo::ViewObserver {
  public:
   WMFlowApp() : shell_(nullptr), embed_count_(0) {}
-  virtual ~WMFlowApp() { STLDeleteValues(&uploaders_); }
+  ~WMFlowApp() override { STLDeleteValues(&uploaders_); }
 
  private:
   typedef std::map<mojo::View*, mojo::BitmapUploader*> ViewToUploader;
 
   // Overridden from ApplicationDelegate:
-  virtual void Initialize(mojo::ApplicationImpl* app) override {
+  void Initialize(mojo::ApplicationImpl* app) override {
     shell_ = app->shell();
     view_manager_client_factory_.reset(
         new mojo::ViewManagerClientFactory(app->shell(), this));
     view_manager_context_.reset(new mojo::ViewManagerContext(app));
     // FIXME: Mojo applications don't know their URLs yet:
     // https://docs.google.com/a/chromium.org/document/d/1AQ2y6ekzvbdaMF5WrUQmneyXJnke-MnYYL4Gz1AKDos
     url_ = GURL(app->args()[1]);
     OpenNewWindow();
     OpenNewWindow();
     OpenNewWindow();
   }
-  virtual bool ConfigureIncomingConnection(
+  bool ConfigureIncomingConnection(
       mojo::ApplicationConnection* connection) override {
     connection->AddService(view_manager_client_factory_.get());
     return true;
   }
 
   // Overridden from mojo::ViewManagerDelegate:
-  virtual void OnEmbed(mojo::View* root,
-                       mojo::InterfaceRequest<mojo::ServiceProvider> services,
-                       mojo::ServiceProviderPtr exposed_services) override {
+  void OnEmbed(mojo::View* root,
+               mojo::InterfaceRequest<mojo::ServiceProvider> services,
+               mojo::ServiceProviderPtr exposed_services) override {
     root->AddObserver(this);
     mojo::BitmapUploader* uploader = new mojo::BitmapUploader(root);
     uploaders_[root] = uploader;
     uploader->Init(shell_);
     // BitmapUploader does not track view size changes, we would
     // need to subscribe to OnViewBoundsChanged and tell the bitmap uploader
     // to invalidate itself.  This is better done once if had a per-view
     // object instead of holding per-view state on the ApplicationDelegate.
     uploader->SetColor(kColors[embed_count_++ % arraysize(kColors)]);
 
@@ skipping 15 matching lines @@
                  embedee_exposed_services.Pass());
     // FIXME: This is wrong.  We're storing per-view state on this per-app
     // delegate.  Every time a new view is created embedee_ is replaced
     // causing the previous one to shut down.  This class should not
     // be a ViewManagerDelegate, but rather a separate object should be
     // created for each embedding.
     mojo::ConnectToService(imported.get(), &embeddee_);
     embeddee_->HelloBack(base::Bind(&WMFlowApp::HelloBackAck,
                                     base::Unretained(this)));
   }
-  virtual void OnViewManagerDisconnected(
-      mojo::ViewManager* view_manager) override {
+  void OnViewManagerDisconnected(mojo::ViewManager* view_manager) override {
     STLDeleteValues(&uploaders_);
   }
 
   // Overridden from mojo::ViewObserver:
-  virtual void OnViewInputEvent(mojo::View* view,
-                                const mojo::EventPtr& event) override {
+  void OnViewInputEvent(mojo::View* view,
+                        const mojo::EventPtr& event) override {
     if (event->action == mojo::EVENT_TYPE_MOUSE_RELEASED &&
         event->flags & mojo::EVENT_FLAGS_LEFT_MOUSE_BUTTON) {
       OpenNewWindow();
     }
   }
-  virtual void OnViewDestroyed(mojo::View* view) override {
+  void OnViewDestroyed(mojo::View* view) override {
     if (uploaders_.find(view) != uploaders_.end()) {
       delete uploaders_[view];
       uploaders_.erase(view);
     }
     --embed_count_;
     view->RemoveObserver(this);
   }
 
   void HelloBackAck() {
     printf("HelloBack() ack'ed\n");
@@ skipping 12 matching lines @@
 
   DISALLOW_COPY_AND_ASSIGN(WMFlowApp);
 };
 
 }  // namespace examples
 
 MojoResult MojoMain(MojoHandle shell_handle) {
   mojo::ApplicationRunnerChromium runner(new examples::WMFlowApp);
   return runner.Run(shell_handle);
 }