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

Side by Side Diff: ui/chromeos/network/network_list.h

Issue 623293004: replace OVERRIDE and FINAL with override and final in ui/ (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase on master 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 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 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 UI_CHROMEOS_NETWORK_NETWORK_LIST_H_ 5 #ifndef UI_CHROMEOS_NETWORK_NETWORK_LIST_H_
6 #define UI_CHROMEOS_NETWORK_NETWORK_LIST_H_ 6 #define UI_CHROMEOS_NETWORK_NETWORK_LIST_H_
7 7
8 #include <map> 8 #include <map>
9 #include <set> 9 #include <set>
10 #include <string> 10 #include <string>
(...skipping 33 matching lines...) Expand 10 before | Expand all | Expand 10 after
44 private: 44 private:
45 void UpdateNetworks( 45 void UpdateNetworks(
46 const chromeos::NetworkStateHandler::NetworkStateList& networks); 46 const chromeos::NetworkStateHandler::NetworkStateList& networks);
47 void UpdateNetworkListInternal(); 47 void UpdateNetworkListInternal();
48 bool UpdateNetworkListEntries(std::set<std::string>* new_service_paths); 48 bool UpdateNetworkListEntries(std::set<std::string>* new_service_paths);
49 bool UpdateNetworkChild(int index, const NetworkInfo* info); 49 bool UpdateNetworkChild(int index, const NetworkInfo* info);
50 bool PlaceViewAtIndex(views::View* view, int index); 50 bool PlaceViewAtIndex(views::View* view, int index);
51 bool UpdateInfoLabel(int message_id, int index, views::Label** label); 51 bool UpdateInfoLabel(int message_id, int index, views::Label** label);
52 52
53 // network_icon::AnimationObserver: 53 // network_icon::AnimationObserver:
54 virtual void NetworkIconChanged() OVERRIDE; 54 virtual void NetworkIconChanged() override;
55 55
56 NetworkListDelegate* delegate_; 56 NetworkListDelegate* delegate_;
57 views::View* content_; 57 views::View* content_;
58 58
59 views::Label* scanning_view_; 59 views::Label* scanning_view_;
60 views::Label* no_wifi_networks_view_; 60 views::Label* no_wifi_networks_view_;
61 views::Label* no_cellular_networks_view_; 61 views::Label* no_cellular_networks_view_;
62 62
63 // An owned list of network info. 63 // An owned list of network info.
64 ScopedVector<NetworkInfo> network_list_; 64 ScopedVector<NetworkInfo> network_list_;
65 65
66 typedef std::map<views::View*, std::string> NetworkMap; 66 typedef std::map<views::View*, std::string> NetworkMap;
67 NetworkMap network_map_; 67 NetworkMap network_map_;
68 68
69 // A map of network service paths to their view. 69 // A map of network service paths to their view.
70 typedef std::map<std::string, views::View*> ServicePathMap; 70 typedef std::map<std::string, views::View*> ServicePathMap;
71 ServicePathMap service_path_map_; 71 ServicePathMap service_path_map_;
72 72
73 DISALLOW_COPY_AND_ASSIGN(NetworkListView); 73 DISALLOW_COPY_AND_ASSIGN(NetworkListView);
74 }; 74 };
75 75
76 } // namespace ui 76 } // namespace ui
77 77
78 #endif // UI_CHROMEOS_NETWORK_NETWORK_LIST_H_ 78 #endif // UI_CHROMEOS_NETWORK_NETWORK_LIST_H_
OLDNEW
« no previous file with comments | « ui/chromeos/network/network_icon_animation.h ('k') | ui/chromeos/touch_exploration_controller.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698