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

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

Issue 20087002: Add migration from CaCert NSS nicknames to PEM. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fix unittests depending on NetworkHandler and not on CertLoader. Created 7 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 | Annotate | Revision Log
« no previous file with comments | « chromeos/network/network_handler.cc ('k') | chromeos/network/network_state.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 (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 <string> 8 #include <string>
9 #include <vector> 9 #include <vector>
10 10
(...skipping 56 matching lines...) Expand 10 before | Expand all | Expand 10 after
67 const std::string& roaming() const { return roaming_; } 67 const std::string& roaming() const { return roaming_; }
68 bool activate_over_non_cellular_networks() const { 68 bool activate_over_non_cellular_networks() const {
69 return activate_over_non_cellular_networks_; 69 return activate_over_non_cellular_networks_;
70 } 70 }
71 bool cellular_out_of_credits() const { return cellular_out_of_credits_; } 71 bool cellular_out_of_credits() const { return cellular_out_of_credits_; }
72 const std::string& usage_url() const { return usage_url_; } 72 const std::string& usage_url() const { return usage_url_; }
73 const std::string& payment_url() const { return payment_url_; } 73 const std::string& payment_url() const { return payment_url_; }
74 const std::string& post_method() const { return post_method_; } 74 const std::string& post_method() const { return post_method_; }
75 const std::string& post_data() const { return post_data_; } 75 const std::string& post_data() const { return post_data_; }
76 76
77 // Whether this network has a CACertNSS nickname set.
78 bool HasCACertNSS() const { return has_ca_cert_nss_; }
79
77 // Returns true if |connection_state_| is a connected/connecting state. 80 // Returns true if |connection_state_| is a connected/connecting state.
78 bool IsConnectedState() const; 81 bool IsConnectedState() const;
79 bool IsConnectingState() const; 82 bool IsConnectingState() const;
80 83
81 // Returns true if the ONC source is a device or user policy. 84 // Returns true if the ONC source is a device or user policy.
82 bool IsManaged() const; 85 bool IsManaged() const;
83 86
84 // Returns true if the network properties are stored in a user profile. 87 // Returns true if the network properties are stored in a user profile.
85 bool IsPrivate() const; 88 bool IsPrivate() const;
86 89
(...skipping 60 matching lines...) Expand 10 before | Expand all | Expand 10 after
147 std::string activation_state_; 150 std::string activation_state_;
148 std::string roaming_; 151 std::string roaming_;
149 bool activate_over_non_cellular_networks_; 152 bool activate_over_non_cellular_networks_;
150 bool cellular_out_of_credits_; 153 bool cellular_out_of_credits_;
151 // Cellular payment portal properties. 154 // Cellular payment portal properties.
152 std::string usage_url_; 155 std::string usage_url_;
153 std::string payment_url_; 156 std::string payment_url_;
154 std::string post_method_; 157 std::string post_method_;
155 std::string post_data_; 158 std::string post_data_;
156 159
160 // Whether a deprecated CaCertNSS property of this network is set. Required
161 // for migration to PEM.
162 bool has_ca_cert_nss_;
163
157 DISALLOW_COPY_AND_ASSIGN(NetworkState); 164 DISALLOW_COPY_AND_ASSIGN(NetworkState);
158 }; 165 };
159 166
160 } // namespace chromeos 167 } // namespace chromeos
161 168
162 #endif // CHROMEOS_NETWORK_NETWORK_STATE_H_ 169 #endif // CHROMEOS_NETWORK_NETWORK_STATE_H_
OLDNEW
« no previous file with comments | « chromeos/network/network_handler.cc ('k') | chromeos/network/network_state.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698