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

Side by Side Diff: ash/system/chromeos/network/tray_vpn.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/chromeos/network/tray_sms.cc ('k') | ash/system/chromeos/network/tray_vpn.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_CHROMEOS_NETWORK_TRAY_VPN_H 5 #ifndef ASH_SYSTEM_CHROMEOS_NETWORK_TRAY_VPN_H
6 #define ASH_SYSTEM_CHROMEOS_NETWORK_TRAY_VPN_H 6 #define ASH_SYSTEM_CHROMEOS_NETWORK_TRAY_VPN_H
7 7
8 #include "ash/system/chromeos/network/tray_network_state_observer.h" 8 #include "ash/system/chromeos/network/tray_network_state_observer.h"
9 #include "ash/system/tray/system_tray_item.h" 9 #include "ash/system/tray/system_tray_item.h"
10 #include "base/memory/scoped_ptr.h" 10 #include "base/memory/scoped_ptr.h"
11 11
12 namespace ash { 12 namespace ash {
13 class TrayNetworkStateObserver; 13 class TrayNetworkStateObserver;
14 14
15 namespace tray { 15 namespace tray {
16 class NetworkDetailedView; 16 class NetworkDetailedView;
17 class VpnDefaultView; 17 class VpnDefaultView;
18 class VpnDetailedView; 18 class VpnDetailedView;
19 } 19 }
20 20
21 class TrayVPN : public SystemTrayItem, 21 class TrayVPN : public SystemTrayItem,
22 public TrayNetworkStateObserver::Delegate { 22 public TrayNetworkStateObserver::Delegate {
23 public: 23 public:
24 explicit TrayVPN(SystemTray* system_tray); 24 explicit TrayVPN(SystemTray* system_tray);
25 virtual ~TrayVPN(); 25 virtual ~TrayVPN();
26 26
27 // SystemTrayItem 27 // SystemTrayItem
28 virtual views::View* CreateTrayView(user::LoginStatus status) OVERRIDE; 28 virtual views::View* CreateTrayView(user::LoginStatus status) override;
29 virtual views::View* CreateDefaultView(user::LoginStatus status) OVERRIDE; 29 virtual views::View* CreateDefaultView(user::LoginStatus status) override;
30 virtual views::View* CreateDetailedView(user::LoginStatus status) OVERRIDE; 30 virtual views::View* CreateDetailedView(user::LoginStatus status) override;
31 virtual void DestroyTrayView() OVERRIDE; 31 virtual void DestroyTrayView() override;
32 virtual void DestroyDefaultView() OVERRIDE; 32 virtual void DestroyDefaultView() override;
33 virtual void DestroyDetailedView() OVERRIDE; 33 virtual void DestroyDetailedView() override;
34 virtual void UpdateAfterLoginStatusChange(user::LoginStatus status) OVERRIDE; 34 virtual void UpdateAfterLoginStatusChange(user::LoginStatus status) override;
35 virtual void UpdateAfterShelfAlignmentChange( 35 virtual void UpdateAfterShelfAlignmentChange(
36 ShelfAlignment alignment) OVERRIDE; 36 ShelfAlignment alignment) override;
37 37
38 // TrayNetworkStateObserver::Delegate 38 // TrayNetworkStateObserver::Delegate
39 virtual void NetworkStateChanged(bool list_changed) OVERRIDE; 39 virtual void NetworkStateChanged(bool list_changed) override;
40 virtual void NetworkServiceChanged( 40 virtual void NetworkServiceChanged(
41 const chromeos::NetworkState* network) OVERRIDE; 41 const chromeos::NetworkState* network) override;
42 42
43 private: 43 private:
44 tray::VpnDefaultView* default_; 44 tray::VpnDefaultView* default_;
45 tray::NetworkDetailedView* detailed_; 45 tray::NetworkDetailedView* detailed_;
46 scoped_ptr<TrayNetworkStateObserver> network_state_observer_; 46 scoped_ptr<TrayNetworkStateObserver> network_state_observer_;
47 47
48 DISALLOW_COPY_AND_ASSIGN(TrayVPN); 48 DISALLOW_COPY_AND_ASSIGN(TrayVPN);
49 }; 49 };
50 50
51 } // namespace ash 51 } // namespace ash
52 52
53 #endif // ASH_SYSTEM_CHROMEOS_NETWORK_TRAY_VPN_H 53 #endif // ASH_SYSTEM_CHROMEOS_NETWORK_TRAY_VPN_H
OLDNEW
« no previous file with comments | « ash/system/chromeos/network/tray_sms.cc ('k') | ash/system/chromeos/network/tray_vpn.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698