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

Side by Side Diff: ash/system/chromeos/power/tray_power.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 unified diff | Download patch
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "ash/system/chromeos/power/tray_power.h" 5 #include "ash/system/chromeos/power/tray_power.h"
6 6
7 #include "ash/accessibility_delegate.h" 7 #include "ash/accessibility_delegate.h"
8 #include "ash/ash_switches.h" 8 #include "ash/ash_switches.h"
9 #include "ash/shell.h" 9 #include "ash/shell.h"
10 #include "ash/system/chromeos/power/power_status_view.h" 10 #include "ash/system/chromeos/power/power_status_view.h"
(...skipping 41 matching lines...) Expand 10 before | Expand all | Expand 10 after
52 public: 52 public:
53 PowerTrayView() 53 PowerTrayView()
54 : spring_charger_spoken_notification_count_(0) { 54 : spring_charger_spoken_notification_count_(0) {
55 UpdateImage(); 55 UpdateImage();
56 } 56 }
57 57
58 virtual ~PowerTrayView() { 58 virtual ~PowerTrayView() {
59 } 59 }
60 60
61 // Overriden from views::View. 61 // Overriden from views::View.
62 virtual void GetAccessibleState(ui::AXViewState* state) OVERRIDE { 62 virtual void GetAccessibleState(ui::AXViewState* state) override {
63 state->name = accessible_name_; 63 state->name = accessible_name_;
64 state->role = ui::AX_ROLE_BUTTON; 64 state->role = ui::AX_ROLE_BUTTON;
65 } 65 }
66 66
67 void UpdateStatus(bool battery_alert) { 67 void UpdateStatus(bool battery_alert) {
68 UpdateImage(); 68 UpdateImage();
69 SetVisible(PowerStatus::Get()->IsBatteryPresent()); 69 SetVisible(PowerStatus::Get()->IsBatteryPresent());
70 70
71 if (battery_alert) { 71 if (battery_alert) {
72 accessible_name_ = PowerStatus::Get()->GetAccessibleNameString(true); 72 accessible_name_ = PowerStatus::Get()->GetAccessibleNameString(true);
(...skipping 316 matching lines...) Expand 10 before | Expand all | Expand 10 after
389 } 389 }
390 390
391 if (current_charger != UNKNOWN_CHARGER) { 391 if (current_charger != UNKNOWN_CHARGER) {
392 UMA_HISTOGRAM_ENUMERATION("Power.ChargerType", 392 UMA_HISTOGRAM_ENUMERATION("Power.ChargerType",
393 current_charger, 393 current_charger,
394 CHARGER_TYPE_COUNT); 394 CHARGER_TYPE_COUNT);
395 } 395 }
396 } 396 }
397 397
398 } // namespace ash 398 } // namespace ash
OLDNEW
« no previous file with comments | « ash/system/chromeos/power/tray_power.h ('k') | ash/system/chromeos/power/tray_power_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698