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

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

Issue 853073002: Update {virtual,override,final} to follow C++11 style in ui. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 11 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 12 matching lines...) Expand all
23 23
24 struct NetworkInfo; 24 struct NetworkInfo;
25 class NetworkListDelegate; 25 class NetworkListDelegate;
26 26
27 // NetworkListView can be used to present the list of available networks to the 27 // NetworkListView can be used to present the list of available networks to the
28 // user. 28 // user.
29 class UI_CHROMEOS_EXPORT NetworkListView 29 class UI_CHROMEOS_EXPORT NetworkListView
30 : public network_icon::AnimationObserver { 30 : public network_icon::AnimationObserver {
31 public: 31 public:
32 explicit NetworkListView(NetworkListDelegate* delegate); 32 explicit NetworkListView(NetworkListDelegate* delegate);
33 virtual ~NetworkListView(); 33 ~NetworkListView() override;
34 34
35 void UpdateNetworkList(); 35 void UpdateNetworkList();
36 36
37 // Returns whether |view| is a View that represents a network in the list. 37 // Returns whether |view| is a View that represents a network in the list.
38 // |service_path| is set to the service-path of the network if this returns 38 // |service_path| is set to the service-path of the network if this returns
39 // true, and remains unchanged if this returns false. 39 // true, and remains unchanged if this returns false.
40 bool IsViewInList(views::View* view, std::string* service_path) const; 40 bool IsViewInList(views::View* view, std::string* service_path) const;
41 41
42 void set_content_view(views::View* content) { content_ = content; } 42 void set_content_view(views::View* content) { content_ = content; }
43 43
44 private: 44 private:
45 void UpdateNetworks( 45 void UpdateNetworks(
46 const chromeos::NetworkStateHandler::NetworkStateList& networks); 46 const chromeos::NetworkStateHandler::NetworkStateList& networks);
47 void UpdateNetworkIcons(); 47 void UpdateNetworkIcons();
48 void UpdateNetworkListInternal(); 48 void UpdateNetworkListInternal();
49 void HandleRelayout(); 49 void HandleRelayout();
50 bool UpdateNetworkListEntries(std::set<std::string>* new_service_paths); 50 bool UpdateNetworkListEntries(std::set<std::string>* new_service_paths);
51 bool UpdateNetworkChildren(std::set<std::string>* new_service_paths, 51 bool UpdateNetworkChildren(std::set<std::string>* new_service_paths,
52 int* child_index, 52 int* child_index,
53 bool highlighted); 53 bool highlighted);
54 bool UpdateNetworkChild(int index, const NetworkInfo* info); 54 bool UpdateNetworkChild(int index, const NetworkInfo* info);
55 bool PlaceViewAtIndex(views::View* view, int index); 55 bool PlaceViewAtIndex(views::View* view, int index);
56 bool UpdateInfoLabel(int message_id, int index, views::Label** label); 56 bool UpdateInfoLabel(int message_id, int index, views::Label** label);
57 57
58 // network_icon::AnimationObserver: 58 // network_icon::AnimationObserver:
59 virtual void NetworkIconChanged() override; 59 void NetworkIconChanged() override;
60 60
61 NetworkListDelegate* delegate_; 61 NetworkListDelegate* delegate_;
62 views::View* content_; 62 views::View* content_;
63 63
64 views::Label* scanning_view_; 64 views::Label* scanning_view_;
65 views::Label* no_wifi_networks_view_; 65 views::Label* no_wifi_networks_view_;
66 views::Label* no_cellular_networks_view_; 66 views::Label* no_cellular_networks_view_;
67 67
68 // An owned list of network info. 68 // An owned list of network info.
69 ScopedVector<NetworkInfo> network_list_; 69 ScopedVector<NetworkInfo> network_list_;
70 70
71 typedef std::map<views::View*, std::string> NetworkMap; 71 typedef std::map<views::View*, std::string> NetworkMap;
72 NetworkMap network_map_; 72 NetworkMap network_map_;
73 73
74 // A map of network service paths to their view. 74 // A map of network service paths to their view.
75 typedef std::map<std::string, views::View*> ServicePathMap; 75 typedef std::map<std::string, views::View*> ServicePathMap;
76 ServicePathMap service_path_map_; 76 ServicePathMap service_path_map_;
77 77
78 DISALLOW_COPY_AND_ASSIGN(NetworkListView); 78 DISALLOW_COPY_AND_ASSIGN(NetworkListView);
79 }; 79 };
80 80
81 } // namespace ui 81 } // namespace ui
82 82
83 #endif // UI_CHROMEOS_NETWORK_NETWORK_LIST_H_ 83 #endif // UI_CHROMEOS_NETWORK_NETWORK_LIST_H_
OLDNEW
« no previous file with comments | « ui/chromeos/network/network_icon_animation.h ('k') | ui/chromeos/network/network_state_notifier.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698