| OLD | NEW |
| 1 // Copyright 2016 The Chromium Authors. All rights reserved. | 1 // Copyright 2016 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_NETWORK_NETWORK_LIST_H_ | 5 #ifndef ASH_SYSTEM_NETWORK_NETWORK_LIST_H_ |
| 6 #define ASH_SYSTEM_NETWORK_NETWORK_LIST_H_ | 6 #define ASH_SYSTEM_NETWORK_NETWORK_LIST_H_ |
| 7 | 7 |
| 8 #include <map> | 8 #include <map> |
| 9 #include <memory> | 9 #include <memory> |
| 10 #include <set> | 10 #include <set> |
| (...skipping 55 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 66 // Returns a set of guids for the added network connections. | 66 // Returns a set of guids for the added network connections. |
| 67 std::unique_ptr<std::set<std::string>> UpdateNetworkListEntries(); | 67 std::unique_ptr<std::set<std::string>> UpdateNetworkListEntries(); |
| 68 | 68 |
| 69 // Creates the view which displays a warning message, if a VPN or proxy is | 69 // Creates the view which displays a warning message, if a VPN or proxy is |
| 70 // being used. | 70 // being used. |
| 71 TriView* CreateConnectionWarning(); | 71 TriView* CreateConnectionWarning(); |
| 72 | 72 |
| 73 // Updates |view| with the information in |info|. | 73 // Updates |view| with the information in |info|. |
| 74 void UpdateViewForNetwork(HoverHighlightView* view, const NetworkInfo& info); | 74 void UpdateViewForNetwork(HoverHighlightView* view, const NetworkInfo& info); |
| 75 | 75 |
| 76 // Creates the a battery icon next to the name of Tether networks indicating |
| 77 // the battery percentage of the mobile device that is being used as a |
| 78 // hotspot. |
| 79 views::View* CreatePowerStatusView(const NetworkInfo& info); |
| 80 |
| 76 // Creates the view of an extra icon appearing next to the network name | 81 // Creates the view of an extra icon appearing next to the network name |
| 77 // indicating that the network is controlled by an extension. If no extension | 82 // indicating that the network is controlled by an extension. If no extension |
| 78 // is registered for this network, returns |nullptr|. | 83 // is registered for this network, returns |nullptr|. |
| 79 views::View* CreateControlledByExtensionView(const NetworkInfo& info); | 84 views::View* CreateControlledByExtensionView(const NetworkInfo& info); |
| 80 | 85 |
| 81 // Adds or updates child views representing the network connections when | 86 // Adds or updates child views representing the network connections when |
| 82 // |is_wifi| is matching the attribute of a network connection starting at | 87 // |is_wifi| is matching the attribute of a network connection starting at |
| 83 // |child_index|. Returns a set of guids for the added network | 88 // |child_index|. Returns a set of guids for the added network |
| 84 // connections. | 89 // connections. |
| 85 std::unique_ptr<std::set<std::string>> UpdateNetworkChildren( | 90 std::unique_ptr<std::set<std::string>> UpdateNetworkChildren( |
| (...skipping 56 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 142 using NetworkInfoMap = std::map<std::string, std::unique_ptr<NetworkInfo>>; | 147 using NetworkInfoMap = std::map<std::string, std::unique_ptr<NetworkInfo>>; |
| 143 NetworkInfoMap last_network_info_map_; | 148 NetworkInfoMap last_network_info_map_; |
| 144 | 149 |
| 145 DISALLOW_COPY_AND_ASSIGN(NetworkListView); | 150 DISALLOW_COPY_AND_ASSIGN(NetworkListView); |
| 146 }; | 151 }; |
| 147 | 152 |
| 148 } // namespace tray | 153 } // namespace tray |
| 149 } // namespace ash | 154 } // namespace ash |
| 150 | 155 |
| 151 #endif // ASH_SYSTEM_NETWORK_NETWORK_LIST_H_ | 156 #endif // ASH_SYSTEM_NETWORK_NETWORK_LIST_H_ |
| OLD | NEW |