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

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

Issue 10826225: Clean-up inline members of nested classes (chrome/browser/chromeos/) (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: forgotten files Created 8 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
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_NETWORK_LIBRARY_H_ 5 #ifndef CHROME_BROWSER_CHROMEOS_CROS_NETWORK_LIBRARY_H_
6 #define CHROME_BROWSER_CHROMEOS_CROS_NETWORK_LIBRARY_H_ 6 #define CHROME_BROWSER_CHROMEOS_CROS_NETWORK_LIBRARY_H_
7 7
8 #include <map> 8 #include <map>
9 #include <string> 9 #include <string>
10 #include <vector> 10 #include <vector>
(...skipping 296 matching lines...) Expand 10 before | Expand all | Expand 10 after
307 void SetDisconnected() { 307 void SetDisconnected() {
308 network_->set_disconnected(); 308 network_->set_disconnected();
309 } 309 }
310 private: 310 private:
311 Network* network_; 311 Network* network_;
312 }; 312 };
313 friend class TestApi; 313 friend class TestApi;
314 314
315 // Structure used only for parsing ONC's ProxySettings value. 315 // Structure used only for parsing ONC's ProxySettings value.
316 struct ProxyOncConfig { 316 struct ProxyOncConfig {
317 ProxyOncConfig() : type(PROXY_ONC_DIRECT) {} 317 ProxyOncConfig();
318 318
319 ProxyOncType type; 319 ProxyOncType type;
320 std::string pac_url; // Only for PROXY_TYPE_PAC. 320 std::string pac_url; // Only for PROXY_TYPE_PAC.
321 // Concatenated string of manual proxies only for PROXY_TYPE_MANUAL, 321 // Concatenated string of manual proxies only for PROXY_TYPE_MANUAL,
322 // formatted using chromeos::ProxyConfigServiceImpl::ProxyConfig:: 322 // formatted using chromeos::ProxyConfigServiceImpl::ProxyConfig::
323 // EncodeAndAppendProxyServer. 323 // EncodeAndAppendProxyServer.
324 std::string manual_spec; 324 std::string manual_spec;
325 std::string bypass_rules; // Only for PROXY_TYPE_MANUAL. 325 std::string bypass_rules; // Only for PROXY_TYPE_MANUAL.
326 }; 326 };
327 327
(...skipping 1247 matching lines...) Expand 10 before | Expand all | Expand 10 after
1575 // to SHARED if |shared| is true, otherwise to USER. 1575 // to SHARED if |shared| is true, otherwise to USER.
1576 virtual void ConnectToWimaxNetwork(WimaxNetwork* network, bool shared) = 0; 1576 virtual void ConnectToWimaxNetwork(WimaxNetwork* network, bool shared) = 0;
1577 1577
1578 // Connect to the specified virtual network. 1578 // Connect to the specified virtual network.
1579 virtual void ConnectToVirtualNetwork(VirtualNetwork* network) = 0; 1579 virtual void ConnectToVirtualNetwork(VirtualNetwork* network) = 0;
1580 1580
1581 // Connect to an unconfigured network with given SSID, security, passphrase, 1581 // Connect to an unconfigured network with given SSID, security, passphrase,
1582 // and optional EAP configuration. If |security| is SECURITY_8021X, 1582 // and optional EAP configuration. If |security| is SECURITY_8021X,
1583 // |eap_config| must be provided. 1583 // |eap_config| must be provided.
1584 struct EAPConfigData { 1584 struct EAPConfigData {
1585 EAPConfigData() 1585 EAPConfigData();
1586 : method(EAP_METHOD_UNKNOWN), 1586 ~EAPConfigData();
1587 auth(EAP_PHASE_2_AUTH_AUTO),
1588 use_system_cas(true) {}
1589 ~EAPConfigData() {}
1590 EAPMethod method; 1587 EAPMethod method;
1591 EAPPhase2Auth auth; 1588 EAPPhase2Auth auth;
1592 std::string server_ca_cert_nss_nickname; 1589 std::string server_ca_cert_nss_nickname;
1593 bool use_system_cas; 1590 bool use_system_cas;
1594 std::string client_cert_pkcs11_id; 1591 std::string client_cert_pkcs11_id;
1595 std::string identity; 1592 std::string identity;
1596 std::string anonymous_identity; 1593 std::string anonymous_identity;
1597 }; 1594 };
1598 virtual void ConnectToUnconfiguredWifiNetwork( 1595 virtual void ConnectToUnconfiguredWifiNetwork(
1599 const std::string& ssid, 1596 const std::string& ssid,
1600 ConnectionSecurity security, 1597 ConnectionSecurity security,
1601 const std::string& passphrase, 1598 const std::string& passphrase,
1602 const EAPConfigData* eap_config, 1599 const EAPConfigData* eap_config,
1603 bool save_credentials, 1600 bool save_credentials,
1604 bool shared) = 0; 1601 bool shared) = 0;
1605 1602
1606 // Connect to the specified virtual network with service name. 1603 // Connect to the specified virtual network with service name.
1607 // VPNConfigData must be provided. 1604 // VPNConfigData must be provided.
1608 struct VPNConfigData { 1605 struct VPNConfigData {
1609 VPNConfigData() {} 1606 VPNConfigData();
1610 ~VPNConfigData() {} 1607 ~VPNConfigData();
1611 std::string psk; 1608 std::string psk;
1612 std::string server_ca_cert_nss_nickname; 1609 std::string server_ca_cert_nss_nickname;
1613 std::string client_cert_pkcs11_id; 1610 std::string client_cert_pkcs11_id;
1614 std::string username; 1611 std::string username;
1615 std::string user_passphrase; 1612 std::string user_passphrase;
1616 std::string otp; 1613 std::string otp;
1617 std::string group_name; 1614 std::string group_name;
1618 }; 1615 };
1619 virtual void ConnectToUnconfiguredVirtualNetwork( 1616 virtual void ConnectToUnconfiguredVirtualNetwork(
1620 const std::string& service_name, 1617 const std::string& service_name,
(...skipping 61 matching lines...) Expand 10 before | Expand all | Expand 10 after
1682 const std::string& service_path) = 0; 1679 const std::string& service_path) = 0;
1683 1680
1684 // Factory function, creates a new instance and returns ownership. 1681 // Factory function, creates a new instance and returns ownership.
1685 // For normal usage, access the singleton via CrosLibrary::Get(). 1682 // For normal usage, access the singleton via CrosLibrary::Get().
1686 static NetworkLibrary* GetImpl(bool stub); 1683 static NetworkLibrary* GetImpl(bool stub);
1687 }; 1684 };
1688 1685
1689 } // namespace chromeos 1686 } // namespace chromeos
1690 1687
1691 #endif // CHROME_BROWSER_CHROMEOS_CROS_NETWORK_LIBRARY_H_ 1688 #endif // CHROME_BROWSER_CHROMEOS_CROS_NETWORK_LIBRARY_H_
OLDNEW
« no previous file with comments | « chrome/browser/chromeos/cros/cert_library.cc ('k') | chrome/browser/chromeos/cros/network_library.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698