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

Unified Diff: ash/system/chromeos/settings/tray_settings.cc

Issue 621133002: replace OVERRIDE and FINAL with override and final in ash/ (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: 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 | « ash/system/chromeos/settings/tray_settings.h ('k') | ash/system/chromeos/supervised/tray_supervised_user.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/system/chromeos/settings/tray_settings.cc
diff --git a/ash/system/chromeos/settings/tray_settings.cc b/ash/system/chromeos/settings/tray_settings.cc
index d88d04ba7f3984f4e1e3d74a2424f8bcf3e26c38..8b4c6c9dfa4e310e1b004d662fd03625ae5d84d7 100644
--- a/ash/system/chromeos/settings/tray_settings.cc
+++ b/ash/system/chromeos/settings/tray_settings.cc
@@ -76,7 +76,7 @@ class SettingsDefaultView : public ActionableView,
}
// Overridden from ash::ActionableView.
- virtual bool PerformAction(const ui::Event& event) OVERRIDE {
+ virtual bool PerformAction(const ui::Event& event) override {
bool userAddingRunning = ash::Shell::GetInstance()
->session_state_delegate()
->IsInSecondaryLoginScreen();
@@ -90,7 +90,7 @@ class SettingsDefaultView : public ActionableView,
}
// Overridden from views::View.
- virtual void Layout() OVERRIDE {
+ virtual void Layout() override {
views::View::Layout();
if (label_ && power_status_view_) {
@@ -105,13 +105,13 @@ class SettingsDefaultView : public ActionableView,
}
// Overridden from views::View.
- virtual void ChildPreferredSizeChanged(views::View* child) OVERRIDE {
+ virtual void ChildPreferredSizeChanged(views::View* child) override {
views::View::ChildPreferredSizeChanged(child);
Layout();
}
// Overridden from PowerStatus::Observer.
- virtual void OnPowerStatusChanged() OVERRIDE {
+ virtual void OnPowerStatusChanged() override {
if (!PowerStatus::Get()->IsBatteryPresent())
return;
« no previous file with comments | « ash/system/chromeos/settings/tray_settings.h ('k') | ash/system/chromeos/supervised/tray_supervised_user.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698