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

examples/ganesh_app/texture_uploader.h

 // 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.
 
 #ifndef EXAMPLES_GANESH_APP_TEXTURE_UPLOADER_H_
 #define EXAMPLES_GANESH_APP_TEXTURE_UPLOADER_H_
 
 #include "base/containers/hash_tables.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/memory/weak_ptr.h"
@@ skipping 16 matching lines @@
    public:
     virtual void OnSurfaceIdAvailable(mojo::SurfaceIdPtr surface_id) = 0;
 
    protected:
     virtual ~Client();
   };
 
   TextureUploader(Client* client,
                   mojo::Shell* shell,
                   base::WeakPtr<mojo::GLContext> context);
-  ~TextureUploader();
+  ~TextureUploader() override;
 
   void Upload(scoped_ptr<mojo::GLTexture> texture);
 
  private:
   // mojo::GLContext::Observer
   void OnContextLost() override;
 
   // mojo::ResourceReturner
   void ReturnResources(
       mojo::Array<mojo::ReturnedResourcePtr> resources) override;
@@ skipping 14 matching lines @@
   mojo::Binding<mojo::ResourceReturner> returner_binding_;
 
   base::WeakPtrFactory<TextureUploader> weak_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(TextureUploader);
 };
 
 }  // namespace examples
 
 #endif  // EXAMPLES_GANESH_APP_TEXTURE_UPLOADER_H_