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

Side by Side Diff: ash/system/chromeos/network/tray_network.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
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_NETWORK_H 5 #ifndef ASH_SYSTEM_CHROMEOS_NETWORK_TRAY_NETWORK_H
6 #define ASH_SYSTEM_CHROMEOS_NETWORK_TRAY_NETWORK_H 6 #define ASH_SYSTEM_CHROMEOS_NETWORK_TRAY_NETWORK_H
7 7
8 #include <set> 8 #include <set>
9 9
10 #include "ash/system/chromeos/network/network_observer.h" 10 #include "ash/system/chromeos/network/network_observer.h"
(...skipping 18 matching lines...) Expand all
29 public NetworkObserver, 29 public NetworkObserver,
30 public NetworkPortalDetectorObserver, 30 public NetworkPortalDetectorObserver,
31 public TrayNetworkStateObserver::Delegate { 31 public TrayNetworkStateObserver::Delegate {
32 public: 32 public:
33 explicit TrayNetwork(SystemTray* system_tray); 33 explicit TrayNetwork(SystemTray* system_tray);
34 virtual ~TrayNetwork(); 34 virtual ~TrayNetwork();
35 35
36 tray::NetworkDetailedView* detailed() { return detailed_; } 36 tray::NetworkDetailedView* detailed() { return detailed_; }
37 37
38 // SystemTrayItem 38 // SystemTrayItem
39 virtual views::View* CreateTrayView(user::LoginStatus status) OVERRIDE; 39 virtual views::View* CreateTrayView(user::LoginStatus status) override;
40 virtual views::View* CreateDefaultView(user::LoginStatus status) OVERRIDE; 40 virtual views::View* CreateDefaultView(user::LoginStatus status) override;
41 virtual views::View* CreateDetailedView(user::LoginStatus status) OVERRIDE; 41 virtual views::View* CreateDetailedView(user::LoginStatus status) override;
42 virtual void DestroyTrayView() OVERRIDE; 42 virtual void DestroyTrayView() override;
43 virtual void DestroyDefaultView() OVERRIDE; 43 virtual void DestroyDefaultView() override;
44 virtual void DestroyDetailedView() OVERRIDE; 44 virtual void DestroyDetailedView() override;
45 virtual void UpdateAfterLoginStatusChange(user::LoginStatus status) OVERRIDE; 45 virtual void UpdateAfterLoginStatusChange(user::LoginStatus status) override;
46 virtual void UpdateAfterShelfAlignmentChange( 46 virtual void UpdateAfterShelfAlignmentChange(
47 ShelfAlignment alignment) OVERRIDE; 47 ShelfAlignment alignment) override;
48 48
49 // NetworkObserver 49 // NetworkObserver
50 virtual void RequestToggleWifi() OVERRIDE; 50 virtual void RequestToggleWifi() override;
51 51
52 // NetworkPortalDetectorObserver 52 // NetworkPortalDetectorObserver
53 virtual void OnCaptivePortalDetected( 53 virtual void OnCaptivePortalDetected(
54 const std::string& service_path) OVERRIDE; 54 const std::string& service_path) override;
55 55
56 // TrayNetworkStateObserver::Delegate 56 // TrayNetworkStateObserver::Delegate
57 virtual void NetworkStateChanged(bool list_changed) OVERRIDE; 57 virtual void NetworkStateChanged(bool list_changed) override;
58 virtual void NetworkServiceChanged( 58 virtual void NetworkServiceChanged(
59 const chromeos::NetworkState* network) OVERRIDE; 59 const chromeos::NetworkState* network) override;
60 60
61 private: 61 private:
62 tray::NetworkTrayView* tray_; 62 tray::NetworkTrayView* tray_;
63 tray::NetworkDefaultView* default_; 63 tray::NetworkDefaultView* default_;
64 tray::NetworkDetailedView* detailed_; 64 tray::NetworkDetailedView* detailed_;
65 bool request_wifi_view_; 65 bool request_wifi_view_;
66 scoped_ptr<TrayNetworkStateObserver> network_state_observer_; 66 scoped_ptr<TrayNetworkStateObserver> network_state_observer_;
67 67
68 DISALLOW_COPY_AND_ASSIGN(TrayNetwork); 68 DISALLOW_COPY_AND_ASSIGN(TrayNetwork);
69 }; 69 };
70 70
71 } // namespace ash 71 } // namespace ash
72 72
73 #endif // ASH_SYSTEM_CHROMEOS_NETWORK_TRAY_NETWORK_H 73 #endif // ASH_SYSTEM_CHROMEOS_NETWORK_TRAY_NETWORK_H
OLDNEW
« no previous file with comments | « ash/system/chromeos/network/network_state_notifier_unittest.cc ('k') | ash/system/chromeos/network/tray_network.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698