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

Unified Diff: athena/system/system_ui_impl.cc

Issue 623103002: replace OVERRIDE and FINAL with override and final in athena/ (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase on master 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/system/status_icon_container_view.cc ('k') | athena/test/base/athena_test_base.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: athena/system/system_ui_impl.cc
diff --git a/athena/system/system_ui_impl.cc b/athena/system/system_ui_impl.cc
index 7b3b52586be4eea3b472fe6a425a5e89c170d665..894c1660c43ac06888dd80fce2f33d2e0db05e74 100644
--- a/athena/system/system_ui_impl.cc
+++ b/athena/system/system_ui_impl.cc
@@ -40,14 +40,14 @@ class SystemInfoView : public views::View {
}
// views::View:
- virtual gfx::Size GetPreferredSize() const OVERRIDE {
+ virtual gfx::Size GetPreferredSize() const override {
// The view should be as wide as its parent view.
return gfx::Size(0,
std::max(time_view_->GetPreferredSize().height(),
status_icon_view_->GetPreferredSize().height()));
}
- virtual void Layout() OVERRIDE {
+ virtual void Layout() override {
time_view_->SetBoundsRect(gfx::Rect(time_view_->GetPreferredSize()));
gfx::Size status_icon_preferred_size =
status_icon_view_->GetPreferredSize();
@@ -58,7 +58,7 @@ class SystemInfoView : public views::View {
status_icon_preferred_size.height()));
}
- virtual void ChildPreferredSizeChanged(views::View* child) OVERRIDE {
+ virtual void ChildPreferredSizeChanged(views::View* child) override {
// Relayout to take into account changes in |status_icon_view_|'s width.
// Assume that |time_view_|'s and |status_icon_view_|'s preferred height
// does not change.
@@ -112,11 +112,11 @@ class SystemUIImpl : public SystemUI {
new BackgroundController(background_container_));
}
- virtual void SetBackgroundImage(const gfx::ImageSkia& image) OVERRIDE {
+ virtual void SetBackgroundImage(const gfx::ImageSkia& image) override {
background_controller_->SetImage(image);
}
- virtual views::View* CreateSystemInfoView(ColorScheme color_scheme) OVERRIDE {
+ virtual views::View* CreateSystemInfoView(ColorScheme color_scheme) override {
return new SystemInfoView(color_scheme, system_modal_container_);
}
« no previous file with comments | « athena/system/status_icon_container_view.cc ('k') | athena/test/base/athena_test_base.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698