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

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

Issue 22796014: Eliminate c/b/chromeos/options/network_connect.cc (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Rebase 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 | « chrome/chrome_browser_chromeos.gypi ('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 29 matching lines...) Expand all
40 // stored. 40 // stored.
41 void GetProperties(base::DictionaryValue* dictionary) const; 41 void GetProperties(base::DictionaryValue* dictionary) const;
42 42
43 // Accessors 43 // Accessors
44 const std::string& security() const { return security_; } 44 const std::string& security() const { return security_; }
45 const std::string& device_path() const { return device_path_; } 45 const std::string& device_path() const { return device_path_; }
46 const std::string& guid() const { return guid_; } 46 const std::string& guid() const { return guid_; }
47 const std::string& connection_state() const { return connection_state_; } 47 const std::string& connection_state() const { return connection_state_; }
48 const std::string& profile_path() const { return profile_path_; } 48 const std::string& profile_path() const { return profile_path_; }
49 const std::string& error() const { return error_; } 49 const std::string& error() const { return error_; }
50 const std::string& error_details() const { return error_details_; }
51 bool auto_connect() const { return auto_connect_; } 50 bool auto_connect() const { return auto_connect_; }
52 bool favorite() const { return favorite_; } 51 bool favorite() const { return favorite_; }
53 int priority() const { return priority_; } 52 int priority() const { return priority_; }
54 const base::DictionaryValue& proxy_config() const { return proxy_config_; } 53 const base::DictionaryValue& proxy_config() const { return proxy_config_; }
55 const NetworkUIData& ui_data() const { return ui_data_; } 54 const NetworkUIData& ui_data() const { return ui_data_; }
56 // IPConfig Properties 55 // IPConfig Properties
57 const std::string& ip_address() const { return ip_address_; } 56 const std::string& ip_address() const { return ip_address_; }
58 const std::string& gateway() const { return gateway_; } 57 const std::string& gateway() const { return gateway_; }
59 const std::vector<std::string>& dns_servers() const { return dns_servers_; } 58 const std::vector<std::string>& dns_servers() const { return dns_servers_; }
60 const int prefix_length() const { return prefix_length_; } 59 const int prefix_length() const { return prefix_length_; }
(...skipping 65 matching lines...) Expand 10 before | Expand all | Expand 10 after
126 125
127 // TODO(gauravsh): Audit the list of properties that we are caching. We should 126 // TODO(gauravsh): Audit the list of properties that we are caching. We should
128 // only be doing this for commonly accessed properties. crbug.com/252553 127 // only be doing this for commonly accessed properties. crbug.com/252553
129 // Common Network Service properties 128 // Common Network Service properties
130 std::string security_; 129 std::string security_;
131 std::string device_path_; 130 std::string device_path_;
132 std::string guid_; 131 std::string guid_;
133 std::string connection_state_; 132 std::string connection_state_;
134 std::string profile_path_; 133 std::string profile_path_;
135 std::string error_; 134 std::string error_;
136 std::string error_details_;
137 bool auto_connect_; 135 bool auto_connect_;
138 bool favorite_; 136 bool favorite_;
139 int priority_; 137 int priority_;
140 // TODO(pneubeck): Remove ProxyConfig once NetworkConfigurationHandler 138 // TODO(pneubeck): Remove ProxyConfig once NetworkConfigurationHandler
141 // provides proxy configuration. crbug/241775 139 // provides proxy configuration. crbug/241775
142 base::DictionaryValue proxy_config_; 140 base::DictionaryValue proxy_config_;
143 NetworkUIData ui_data_; 141 NetworkUIData ui_data_;
144 // IPConfig properties. 142 // IPConfig properties.
145 // Note: These do not correspond to actual Shill.Service properties 143 // Note: These do not correspond to actual Shill.Service properties
146 // but are derived from the service's corresponding IPConfig object. 144 // but are derived from the service's corresponding IPConfig object.
(...skipping 20 matching lines...) Expand all
167 // Whether a deprecated CaCertNSS property of this network is set. Required 165 // Whether a deprecated CaCertNSS property of this network is set. Required
168 // for migration to PEM. 166 // for migration to PEM.
169 bool has_ca_cert_nss_; 167 bool has_ca_cert_nss_;
170 168
171 DISALLOW_COPY_AND_ASSIGN(NetworkState); 169 DISALLOW_COPY_AND_ASSIGN(NetworkState);
172 }; 170 };
173 171
174 } // namespace chromeos 172 } // namespace chromeos
175 173
176 #endif // CHROMEOS_NETWORK_NETWORK_STATE_H_ 174 #endif // CHROMEOS_NETWORK_NETWORK_STATE_H_
OLDNEW
« no previous file with comments | « chrome/chrome_browser_chromeos.gypi ('k') | chromeos/network/network_state.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698