| 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;
|
|
|
|
|