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

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

Issue 984863005: Add ash::VPNDelegate and Chrome OS implementation (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Added a VPNProvider::Key abstraction. 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_extension_id() const {
96 return vpn_provider_extension_id_;
97 }
95 98
96 // Returns true if |connection_state_| is a connected/connecting state. 99 // Returns true if |connection_state_| is a connected/connecting state.
97 bool IsConnectedState() const; 100 bool IsConnectedState() const;
98 bool IsConnectingState() const; 101 bool IsConnectingState() const;
99 102
100 // Returns true if this is a network stored in a profile. 103 // Returns true if this is a network stored in a profile.
101 bool IsInProfile() const; 104 bool IsInProfile() const;
102 105
103 // Returns true if the network properties are stored in a user profile. 106 // Returns true if the network properties are stored in a user profile.
104 bool IsPrivate() const; 107 bool IsPrivate() const;
(...skipping 68 matching lines...) Expand 10 before | Expand all | Expand 10 after
173 int signal_strength_; 176 int signal_strength_;
174 177
175 // Cellular properties, used for icons, Connect, and Activation. 178 // Cellular properties, used for icons, Connect, and Activation.
176 std::string network_technology_; 179 std::string network_technology_;
177 std::string activation_type_; 180 std::string activation_type_;
178 std::string activation_state_; 181 std::string activation_state_;
179 std::string roaming_; 182 std::string roaming_;
180 std::string payment_url_; 183 std::string payment_url_;
181 bool cellular_out_of_credits_; 184 bool cellular_out_of_credits_;
182 185
186 // VPN property. For networks using a third-party VPN provider, this will be
187 // the provider's extension ID. For networks using the built-in OpenVPN and
188 // L2TP support, this will be an empty string.
189 std::string vpn_provider_extension_id_;
190
183 // TODO(pneubeck): Remove this once (Managed)NetworkConfigurationHandler 191 // TODO(pneubeck): Remove this once (Managed)NetworkConfigurationHandler
184 // provides proxy configuration. crbug.com/241775 192 // provides proxy configuration. crbug.com/241775
185 base::DictionaryValue proxy_config_; 193 base::DictionaryValue proxy_config_;
186 194
187 DISALLOW_COPY_AND_ASSIGN(NetworkState); 195 DISALLOW_COPY_AND_ASSIGN(NetworkState);
188 }; 196 };
189 197
190 } // namespace chromeos 198 } // namespace chromeos
191 199
192 #endif // CHROMEOS_NETWORK_NETWORK_STATE_H_ 200 #endif // CHROMEOS_NETWORK_NETWORK_STATE_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698