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

Side by Side Diff: chromeos/network/network_state.h

Issue 980943005: Add ash UI for third-party VPNs (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@f_2_407541_434711_remove_combined_name
Patch Set: Created 5 years, 9 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 CHROMEOS_NETWORK_NETWORK_STATE_H_ 5 #ifndef CHROMEOS_NETWORK_NETWORK_STATE_H_
6 #define CHROMEOS_NETWORK_NETWORK_STATE_H_ 6 #define CHROMEOS_NETWORK_NETWORK_STATE_H_
7 7
8 #include <stdint.h> 8 #include <stdint.h>
9 9
10 #include <string> 10 #include <string>
(...skipping 74 matching lines...) Expand 10 before | Expand all | Expand 10 after
85 85
86 // Cellular property accessors 86 // Cellular property accessors
87 const std::string& network_technology() const { 87 const std::string& network_technology() const {
88 return network_technology_; 88 return network_technology_;
89 } 89 }
90 const std::string& activation_type() const { return activation_type_; } 90 const std::string& activation_type() const { return activation_type_; }
91 const std::string& activation_state() const { return activation_state_; } 91 const std::string& activation_state() const { return activation_state_; }
92 const std::string& roaming() const { return roaming_; } 92 const std::string& roaming() const { return roaming_; }
93 const std::string& payment_url() const { return payment_url_; } 93 const std::string& payment_url() const { return payment_url_; }
94 bool cellular_out_of_credits() const { return cellular_out_of_credits_; } 94 bool cellular_out_of_credits() const { return cellular_out_of_credits_; }
95 const std::string& vpn_provider_id() const { return vpn_provider_id_; }
95 96
96 // Returns true if |connection_state_| is a connected/connecting state. 97 // Returns true if |connection_state_| is a connected/connecting state.
97 bool IsConnectedState() const; 98 bool IsConnectedState() const;
98 bool IsConnectingState() const; 99 bool IsConnectingState() const;
99 100
100 // Returns true if this is a network stored in a profile. 101 // Returns true if this is a network stored in a profile.
101 bool IsInProfile() const; 102 bool IsInProfile() const;
102 103
103 // Returns true if the network properties are stored in a user profile. 104 // Returns true if the network properties are stored in a user profile.
104 bool IsPrivate() const; 105 bool IsPrivate() const;
(...skipping 68 matching lines...) Expand 10 before | Expand all | Expand 10 after
173 int signal_strength_; 174 int signal_strength_;
174 175
175 // Cellular properties, used for icons, Connect, and Activation. 176 // Cellular properties, used for icons, Connect, and Activation.
176 std::string network_technology_; 177 std::string network_technology_;
177 std::string activation_type_; 178 std::string activation_type_;
178 std::string activation_state_; 179 std::string activation_state_;
179 std::string roaming_; 180 std::string roaming_;
180 std::string payment_url_; 181 std::string payment_url_;
181 bool cellular_out_of_credits_; 182 bool cellular_out_of_credits_;
182 183
184 // Property that indicates a VPN's provider: An extension ID for networks
185 // using a third-party provider or an empty string for networks using the
186 // built-in OpenVPN and L2TP support.
187 std::string vpn_provider_id_;
188
183 // TODO(pneubeck): Remove this once (Managed)NetworkConfigurationHandler 189 // TODO(pneubeck): Remove this once (Managed)NetworkConfigurationHandler
184 // provides proxy configuration. crbug.com/241775 190 // provides proxy configuration. crbug.com/241775
185 base::DictionaryValue proxy_config_; 191 base::DictionaryValue proxy_config_;
186 192
187 DISALLOW_COPY_AND_ASSIGN(NetworkState); 193 DISALLOW_COPY_AND_ASSIGN(NetworkState);
188 }; 194 };
189 195
190 } // namespace chromeos 196 } // namespace chromeos
191 197
192 #endif // CHROMEOS_NETWORK_NETWORK_STATE_H_ 198 #endif // CHROMEOS_NETWORK_NETWORK_STATE_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698