Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(43)

Unified Diff: athena/wm/overview_toolbar.cc

Issue 641683003: C++11 override style change for athena (Closed) Base URL: https://chromium.googlesource.com/chromium/src@master
Patch Set: rebase Created 6 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « athena/wm/bezel_controller.h ('k') | athena/wm/split_view_controller.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: athena/wm/overview_toolbar.cc
diff --git a/athena/wm/overview_toolbar.cc b/athena/wm/overview_toolbar.cc
index abd08487c1980cca1318c2a6d45910bc92463066..5942a5d53496b6987d5e70a546d98c1d17defe84 100644
--- a/athena/wm/overview_toolbar.cc
+++ b/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();
}
« no previous file with comments | « athena/wm/bezel_controller.h ('k') | athena/wm/split_view_controller.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698