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

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

Issue 1270623002: Replace 'Scanning' text in Network Status Area with throbber (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fix tooltips Created 5 years, 4 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 | « chromeos/dbus/fake_shill_manager_client.cc ('k') | ui/chromeos/network/network_list.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 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 40 matching lines...) Expand 10 before | Expand all | Expand 10 after
51 bool highlighted); 51 bool highlighted);
52 bool UpdateNetworkChild(int index, const NetworkInfo* info); 52 bool UpdateNetworkChild(int index, const NetworkInfo* info);
53 bool PlaceViewAtIndex(views::View* view, int index); 53 bool PlaceViewAtIndex(views::View* view, int index);
54 bool UpdateInfoLabel(int message_id, int index, views::Label** label); 54 bool UpdateInfoLabel(int message_id, int index, views::Label** label);
55 55
56 // network_icon::AnimationObserver: 56 // network_icon::AnimationObserver:
57 void NetworkIconChanged() override; 57 void NetworkIconChanged() override;
58 58
59 NetworkListDelegate* delegate_; 59 NetworkListDelegate* delegate_;
60 60
61 views::Label* scanning_view_;
62 views::Label* no_wifi_networks_view_; 61 views::Label* no_wifi_networks_view_;
63 views::Label* no_cellular_networks_view_; 62 views::Label* no_cellular_networks_view_;
64 63
65 // An owned list of network info. 64 // An owned list of network info.
66 ScopedVector<NetworkInfo> network_list_; 65 ScopedVector<NetworkInfo> network_list_;
67 66
68 typedef std::map<views::View*, std::string> NetworkMap; 67 typedef std::map<views::View*, std::string> NetworkMap;
69 NetworkMap network_map_; 68 NetworkMap network_map_;
70 69
71 // A map of network service paths to their view. 70 // A map of network service paths to their view.
72 typedef std::map<std::string, views::View*> ServicePathMap; 71 typedef std::map<std::string, views::View*> ServicePathMap;
73 ServicePathMap service_path_map_; 72 ServicePathMap service_path_map_;
74 73
75 DISALLOW_COPY_AND_ASSIGN(NetworkListView); 74 DISALLOW_COPY_AND_ASSIGN(NetworkListView);
76 }; 75 };
77 76
78 } // namespace ui 77 } // namespace ui
79 78
80 #endif // UI_CHROMEOS_NETWORK_NETWORK_LIST_H_ 79 #endif // UI_CHROMEOS_NETWORK_NETWORK_LIST_H_
OLDNEW
« no previous file with comments | « chromeos/dbus/fake_shill_manager_client.cc ('k') | ui/chromeos/network/network_list.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698