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

Side by Side Diff: chrome/browser/chromeos/cros/onc_network_parser.h

Issue 10915106: Renaming instances of "flimflam" with "shill", now that we're only (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: Upload after merge Created 8 years, 3 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 CHROME_BROWSER_CHROMEOS_CROS_ONC_NETWORK_PARSER_H_ 5 #ifndef CHROME_BROWSER_CHROMEOS_CROS_ONC_NETWORK_PARSER_H_
6 #define CHROME_BROWSER_CHROMEOS_CROS_ONC_NETWORK_PARSER_H_ 6 #define CHROME_BROWSER_CHROMEOS_CROS_ONC_NETWORK_PARSER_H_
7 7
8 #include <string> 8 #include <string>
9 9
10 #include "base/compiler_specific.h" // for OVERRIDE 10 #include "base/compiler_specific.h" // for OVERRIDE
(...skipping 129 matching lines...) Expand 10 before | Expand all | Expand 10 after
140 net::CertificateList* result); 140 net::CertificateList* result);
141 // This deletes any certificate that has the string |label| as its 141 // This deletes any certificate that has the string |label| as its
142 // nickname (exact match). 142 // nickname (exact match).
143 static bool DeleteCertAndKeyByNickname(const std::string& label); 143 static bool DeleteCertAndKeyByNickname(const std::string& label);
144 144
145 // Find the PKCS#11 ID of the certificate with the given GUID. Returns 145 // Find the PKCS#11 ID of the certificate with the given GUID. Returns
146 // an empty string on failure. 146 // an empty string on failure.
147 static std::string GetPkcs11IdFromCertGuid(const std::string& guid); 147 static std::string GetPkcs11IdFromCertGuid(const std::string& guid);
148 148
149 // Process ProxySettings dictionary into a format which is then updated into 149 // Process ProxySettings dictionary into a format which is then updated into
150 // ProxyConfig property in flimflam. 150 // ProxyConfig property in shill.
151 static bool ProcessProxySettings(OncNetworkParser* parser, 151 static bool ProcessProxySettings(OncNetworkParser* parser,
152 const base::Value& value, 152 const base::Value& value,
153 Network* network); 153 Network* network);
154 154
155 static ClientCertType ParseClientCertType(const std::string& type); 155 static ClientCertType ParseClientCertType(const std::string& type);
156 156
157 // Parse ClientCertPattern dictionary that specifies certificate pattern for 157 // Parse ClientCertPattern dictionary that specifies certificate pattern for
158 // VPN and WiFi EAP certificates. 158 // VPN and WiFi EAP certificates.
159 static bool ParseClientCertPattern(OncNetworkParser* parser, 159 static bool ParseClientCertPattern(OncNetworkParser* parser,
160 PropertyIndex index, 160 PropertyIndex index,
(...skipping 170 matching lines...) Expand 10 before | Expand all | Expand 10 after
331 const base::Value& value, 331 const base::Value& value,
332 Network* network); 332 Network* network);
333 333
334 private: 334 private:
335 DISALLOW_COPY_AND_ASSIGN(OncVirtualNetworkParser); 335 DISALLOW_COPY_AND_ASSIGN(OncVirtualNetworkParser);
336 }; 336 };
337 337
338 } // namespace chromeos 338 } // namespace chromeos
339 339
340 #endif // CHROME_BROWSER_CHROMEOS_CROS_ONC_NETWORK_PARSER_H_ 340 #endif // CHROME_BROWSER_CHROMEOS_CROS_ONC_NETWORK_PARSER_H_
OLDNEW
« no previous file with comments | « chrome/browser/chromeos/cros/network_parser.h ('k') | chrome/browser/chromeos/cros/onc_network_parser.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698