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

Side by Side Diff: ash/system/chromeos/network/network_state_list_detailed_view.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_NETWORK_STATE_LIST_DETAILED_VIEW_H 5 #ifndef ASH_SYSTEM_CHROMEOS_NETWORK_NETWORK_STATE_LIST_DETAILED_VIEW_H
6 #define ASH_SYSTEM_CHROMEOS_NETWORK_NETWORK_STATE_LIST_DETAILED_VIEW_H 6 #define ASH_SYSTEM_CHROMEOS_NETWORK_NETWORK_STATE_LIST_DETAILED_VIEW_H
7 7
8 #include <string> 8 #include <string>
9 9
10 #include "ash/system/chromeos/network/network_detailed_view.h" 10 #include "ash/system/chromeos/network/network_detailed_view.h"
(...skipping 31 matching lines...) Expand 10 before | Expand all | Expand 10 after
42 LIST_TYPE_NETWORK, 42 LIST_TYPE_NETWORK,
43 LIST_TYPE_VPN 43 LIST_TYPE_VPN
44 }; 44 };
45 45
46 NetworkStateListDetailedView(SystemTrayItem* owner, 46 NetworkStateListDetailedView(SystemTrayItem* owner,
47 ListType list_type, 47 ListType list_type,
48 user::LoginStatus login); 48 user::LoginStatus login);
49 virtual ~NetworkStateListDetailedView(); 49 virtual ~NetworkStateListDetailedView();
50 50
51 // Overridden from NetworkDetailedView: 51 // Overridden from NetworkDetailedView:
52 virtual void Init() OVERRIDE; 52 virtual void Init() override;
53 virtual DetailedViewType GetViewType() const OVERRIDE; 53 virtual DetailedViewType GetViewType() const override;
54 virtual void ManagerChanged() OVERRIDE; 54 virtual void ManagerChanged() override;
55 virtual void NetworkListChanged() OVERRIDE; 55 virtual void NetworkListChanged() override;
56 virtual void NetworkServiceChanged( 56 virtual void NetworkServiceChanged(
57 const chromeos::NetworkState* network) OVERRIDE; 57 const chromeos::NetworkState* network) override;
58 58
59 protected: 59 protected:
60 // Overridden from ButtonListener. 60 // Overridden from ButtonListener.
61 virtual void ButtonPressed(views::Button* sender, 61 virtual void ButtonPressed(views::Button* sender,
62 const ui::Event& event) OVERRIDE; 62 const ui::Event& event) override;
63 63
64 // Overridden from ViewClickListener. 64 // Overridden from ViewClickListener.
65 virtual void OnViewClicked(views::View* sender) OVERRIDE; 65 virtual void OnViewClicked(views::View* sender) override;
66 66
67 private: 67 private:
68 class InfoBubble; 68 class InfoBubble;
69 69
70 // Create UI components. 70 // Create UI components.
71 void CreateHeaderEntry(); 71 void CreateHeaderEntry();
72 void CreateHeaderButtons(); 72 void CreateHeaderButtons();
73 void CreateNetworkExtra(); 73 void CreateNetworkExtra();
74 74
75 // Update UI components. 75 // Update UI components.
(...skipping 18 matching lines...) Expand all
94 views::View* CreateNetworkInfoView(); 94 views::View* CreateNetworkInfoView();
95 95
96 // Periodically request a network scan. 96 // Periodically request a network scan.
97 void CallRequestScan(); 97 void CallRequestScan();
98 98
99 // Handle toggile mobile action 99 // Handle toggile mobile action
100 void ToggleMobile(); 100 void ToggleMobile();
101 101
102 // ui::NetworkListDelegate: 102 // ui::NetworkListDelegate:
103 virtual views::View* CreateViewForNetwork( 103 virtual views::View* CreateViewForNetwork(
104 const ui::NetworkInfo& info) OVERRIDE; 104 const ui::NetworkInfo& info) override;
105 virtual bool IsViewHovered(views::View* view) OVERRIDE; 105 virtual bool IsViewHovered(views::View* view) override;
106 virtual chromeos::NetworkTypePattern GetNetworkTypePattern() const OVERRIDE; 106 virtual chromeos::NetworkTypePattern GetNetworkTypePattern() const override;
107 virtual void UpdateViewForNetwork(views::View* view, 107 virtual void UpdateViewForNetwork(views::View* view,
108 const ui::NetworkInfo& info) OVERRIDE; 108 const ui::NetworkInfo& info) override;
109 virtual views::Label* CreateInfoLabel() OVERRIDE; 109 virtual views::Label* CreateInfoLabel() override;
110 virtual void RelayoutScrollList() OVERRIDE; 110 virtual void RelayoutScrollList() override;
111 111
112 // Type of list (all networks or vpn) 112 // Type of list (all networks or vpn)
113 ListType list_type_; 113 ListType list_type_;
114 114
115 // Track login state. 115 // Track login state.
116 user::LoginStatus login_; 116 user::LoginStatus login_;
117 117
118 // Child views. 118 // Child views.
119 TrayPopupHeaderButton* info_icon_; 119 TrayPopupHeaderButton* info_icon_;
120 TrayPopupHeaderButton* button_wifi_; 120 TrayPopupHeaderButton* button_wifi_;
(...skipping 10 matching lines...) Expand all
131 131
132 ui::NetworkListView network_list_view_; 132 ui::NetworkListView network_list_view_;
133 133
134 DISALLOW_COPY_AND_ASSIGN(NetworkStateListDetailedView); 134 DISALLOW_COPY_AND_ASSIGN(NetworkStateListDetailedView);
135 }; 135 };
136 136
137 } // namespace tray 137 } // namespace tray
138 } // namespace ash 138 } // namespace ash
139 139
140 #endif // ASH_SYSTEM_CHROMEOS_NETWORK_NETWORK_STATE_LIST_DETAILED_VIEW 140 #endif // ASH_SYSTEM_CHROMEOS_NETWORK_NETWORK_STATE_LIST_DETAILED_VIEW
OLDNEW
« no previous file with comments | « ash/system/chromeos/multi_user/user_switch_util_unittest.cc ('k') | ash/system/chromeos/network/network_state_notifier.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698