commit 7f48021e1d4f383115a718d6c4bfb7578c744733
author James Robinson <jamesr@chromium.org> Fri Oct 31 10:28:08 2014 -0700
committer James Robinson <jamesr@chromium.org> Fri Oct 31 10:28:08 2014 -0700
tree 94fea0c4bd0470b1e68a2802f24ebed892617d42
parent 7c05714462a1f2c668dd3946d953cc36aa685bfc

Update from chromium https://crrev.com/302282

Updates based on chromium https://crrev.com/302282 /
30228db41b946899ce33f284da0adf2b35188d552de47. Contains updates for
https://crrev.com/301916 and https://crrev.com/301795.

TBR=ben@chromium.org

Review URL: https://codereview.chromium.org/683113005

ui/gl/gl_surface_egl.cc

diff --git a/ui/gl/gl_surface_egl.cc b/ui/gl/gl_surface_egl.cc
index b8c29d7..a977edd 100644
--- a/ui/gl/gl_surface_egl.cc
+++ b/ui/gl/gl_surface_egl.cc
@@ -74,12 +74,12 @@
         surface_(surface) {
   }
 
-  virtual ~EGLSyncControlVSyncProvider() { }
+  ~EGLSyncControlVSyncProvider() override {}
 
  protected:
-  virtual bool GetSyncValues(int64* system_time,
-                             int64* media_stream_counter,
-                             int64* swap_buffer_counter) override {
+  bool GetSyncValues(int64* system_time,
+                     int64* media_stream_counter,
+                     int64* swap_buffer_counter) override {
     uint64 u_system_time, u_media_stream_counter, u_swap_buffer_counter;
     bool result = eglGetSyncValuesCHROMIUM(
         g_display, surface_, &u_system_time,
@@ -92,7 +92,7 @@
     return result;
   }
 
-  virtual bool GetMscRate(int32* numerator, int32* denominator) override {
+  bool GetMscRate(int32* numerator, int32* denominator) override {
     return false;
   }