Update To 11.40.268.0

[platform/framework/web/crosswalk.git] / src / athena / wm / overview_toolbar.cc

diff --git a/src/athena/wm/overview_toolbar.cc b/src/athena/wm/overview_toolbar.cc
index 1b55c2a..5942a5d 100644 (file)
--- a/src/athena/wm/overview_toolbar.cc
+++ b/src/athena/wm/overview_toolbar.cc
@@ -39,7 +39,7 @@ class ActionButton : public ui::LayerDelegate {
     layer_->SetOpacity(0);
   }
 
-  virtual ~ActionButton() {}
+  ~ActionButton() override {}
 
   static void DestroyAfterFadeout(scoped_ptr<ActionButton> button) {
     ui::Layer* layer = button->layer();
@@ -64,7 +64,7 @@ class ActionButton : public ui::LayerDelegate {
   }
 
   // ui::LayerDelegate:
-  virtual void OnPaintLayer(gfx::Canvas* canvas) OVERRIDE {
+  void OnPaintLayer(gfx::Canvas* canvas) override {
     ui::ResourceBundle& bundle = ui::ResourceBundle::GetSharedInstance();
     canvas->DrawImageInt(*bundle.GetImageSkiaNamed(resource_id_), 0, 0);
     gfx::ShadowValues shadow;
@@ -82,11 +82,10 @@ class ActionButton : public ui::LayerDelegate {
                                       shadow);
   }
 
-  virtual void OnDelegatedFrameDamage(
-      const gfx::Rect& damage_rect_in_dip) OVERRIDE {}
+  void OnDelegatedFrameDamage(const gfx::Rect& damage_rect_in_dip) override {}
 
-  virtual void OnDeviceScaleFactorChanged(float device_scale_factor) OVERRIDE {}
-  virtual base::Closure PrepareForLayerBoundsChange() OVERRIDE {
+  void OnDeviceScaleFactorChanged(float device_scale_factor) override {}
+  base::Closure PrepareForLayerBoundsChange() override {
     return base::Closure();
   }