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

Side by Side Diff: ash/system/bluetooth/tray_bluetooth.h

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
« no previous file with comments | « ash/system/audio/volume_view.cc ('k') | ash/system/bluetooth/tray_bluetooth.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 #ifndef ASH_SYSTEM_BLUETOOTH_TRAY_BLUETOOTH_H_ 5 #ifndef ASH_SYSTEM_BLUETOOTH_TRAY_BLUETOOTH_H_
6 #define ASH_SYSTEM_BLUETOOTH_TRAY_BLUETOOTH_H_ 6 #define ASH_SYSTEM_BLUETOOTH_TRAY_BLUETOOTH_H_
7 7
8 #include "ash/system/bluetooth/bluetooth_observer.h" 8 #include "ash/system/bluetooth/bluetooth_observer.h"
9 #include "ash/system/tray/system_tray_item.h" 9 #include "ash/system/tray/system_tray_item.h"
10 10
11 namespace ash { 11 namespace ash {
12 namespace tray { 12 namespace tray {
13 class BluetoothDefaultView; 13 class BluetoothDefaultView;
14 class BluetoothDetailedView; 14 class BluetoothDetailedView;
15 } 15 }
16 16
17 class TrayBluetooth : public SystemTrayItem, 17 class TrayBluetooth : public SystemTrayItem,
18 public BluetoothObserver { 18 public BluetoothObserver {
19 public: 19 public:
20 explicit TrayBluetooth(SystemTray* system_tray); 20 explicit TrayBluetooth(SystemTray* system_tray);
21 virtual ~TrayBluetooth(); 21 virtual ~TrayBluetooth();
22 22
23 private: 23 private:
24 // Overridden from SystemTrayItem. 24 // Overridden from SystemTrayItem.
25 virtual views::View* CreateTrayView(user::LoginStatus status) OVERRIDE; 25 virtual views::View* CreateTrayView(user::LoginStatus status) override;
26 virtual views::View* CreateDefaultView(user::LoginStatus status) OVERRIDE; 26 virtual views::View* CreateDefaultView(user::LoginStatus status) override;
27 virtual views::View* CreateDetailedView(user::LoginStatus status) OVERRIDE; 27 virtual views::View* CreateDetailedView(user::LoginStatus status) override;
28 virtual void DestroyTrayView() OVERRIDE; 28 virtual void DestroyTrayView() override;
29 virtual void DestroyDefaultView() OVERRIDE; 29 virtual void DestroyDefaultView() override;
30 virtual void DestroyDetailedView() OVERRIDE; 30 virtual void DestroyDetailedView() override;
31 virtual void UpdateAfterLoginStatusChange(user::LoginStatus status) OVERRIDE; 31 virtual void UpdateAfterLoginStatusChange(user::LoginStatus status) override;
32 32
33 // Overridden from BluetoothObserver. 33 // Overridden from BluetoothObserver.
34 virtual void OnBluetoothRefresh() OVERRIDE; 34 virtual void OnBluetoothRefresh() override;
35 virtual void OnBluetoothDiscoveringChanged() OVERRIDE; 35 virtual void OnBluetoothDiscoveringChanged() override;
36 36
37 tray::BluetoothDefaultView* default_; 37 tray::BluetoothDefaultView* default_;
38 tray::BluetoothDetailedView* detailed_; 38 tray::BluetoothDetailedView* detailed_;
39 39
40 DISALLOW_COPY_AND_ASSIGN(TrayBluetooth); 40 DISALLOW_COPY_AND_ASSIGN(TrayBluetooth);
41 }; 41 };
42 42
43 } // namespace ash 43 } // namespace ash
44 44
45 #endif // ASH_SYSTEM_BLUETOOTH_TRAY_BLUETOOTH_H_ 45 #endif // ASH_SYSTEM_BLUETOOTH_TRAY_BLUETOOTH_H_
OLDNEW
« no previous file with comments | « ash/system/audio/volume_view.cc ('k') | ash/system/bluetooth/tray_bluetooth.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698