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

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

Issue 15294010: Remove NetworkStateInformer's dependency on ProxyConfigServiceImpl. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Added TODO:remove comment to NetworkStateHandler. Created 7 years, 7 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 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
11 #include "base/values.h"
11 #include "chromeos/network/managed_state.h" 12 #include "chromeos/network/managed_state.h"
12 13
13 namespace base {
14 class DictionaryValue;
15 }
16
17 namespace chromeos { 14 namespace chromeos {
18 15
19 // Simple class to provide network state information about a network service. 16 // Simple class to provide network state information about a network service.
20 // This class should always be passed as a const* and should never be held 17 // This class should always be passed as a const* and should never be held
21 // on to. Store network_state->path() (defined in ManagedState) instead and 18 // on to. Store network_state->path() (defined in ManagedState) instead and
22 // call NetworkStateHandler::GetNetworkState(path) to retrieve the state for 19 // call NetworkStateHandler::GetNetworkState(path) to retrieve the state for
23 // the network. 20 // the network.
24 class CHROMEOS_EXPORT NetworkState : public ManagedState { 21 class CHROMEOS_EXPORT NetworkState : public ManagedState {
25 public: 22 public:
26 explicit NetworkState(const std::string& path); 23 explicit NetworkState(const std::string& path);
(...skipping 15 matching lines...) Expand all
42 const std::string& ip_address() const { return ip_address_; } 39 const std::string& ip_address() const { return ip_address_; }
43 const std::vector<std::string>& dns_servers() const { return dns_servers_; } 40 const std::vector<std::string>& dns_servers() const { return dns_servers_; }
44 const std::string& device_path() const { return device_path_; } 41 const std::string& device_path() const { return device_path_; }
45 const std::string& guid() const { return guid_; } 42 const std::string& guid() const { return guid_; }
46 const std::string& connection_state() const { return connection_state_; } 43 const std::string& connection_state() const { return connection_state_; }
47 const std::string& profile_path() const { return profile_path_; } 44 const std::string& profile_path() const { return profile_path_; }
48 const std::string& error() const { return error_; } 45 const std::string& error() const { return error_; }
49 bool auto_connect() const { return auto_connect_; } 46 bool auto_connect() const { return auto_connect_; }
50 bool favorite() const { return favorite_; } 47 bool favorite() const { return favorite_; }
51 int priority() const { return priority_; } 48 int priority() const { return priority_; }
49 const base::DictionaryValue& proxy_config() const { return proxy_config_; }
52 // Wireless property accessors 50 // Wireless property accessors
53 int signal_strength() const { return signal_strength_; } 51 int signal_strength() const { return signal_strength_; }
54 bool connectable() const { return connectable_; } 52 bool connectable() const { return connectable_; }
55 // Wifi property accessors 53 // Wifi property accessors
56 bool passphrase_required() const { return passphrase_required_; } 54 bool passphrase_required() const { return passphrase_required_; }
57 // Cellular property accessors 55 // Cellular property accessors
58 const std::string& technology() const { return technology_; } 56 const std::string& technology() const { return technology_; }
59 const std::string& activation_state() const { return activation_state_; } 57 const std::string& activation_state() const { return activation_state_; }
60 const std::string& roaming() const { return roaming_; } 58 const std::string& roaming() const { return roaming_; }
61 bool activate_over_non_cellular_networks() const { 59 bool activate_over_non_cellular_networks() const {
(...skipping 30 matching lines...) Expand all
92 // Common Network Service properties 90 // Common Network Service properties
93 std::string security_; 91 std::string security_;
94 std::string device_path_; 92 std::string device_path_;
95 std::string guid_; 93 std::string guid_;
96 std::string connection_state_; 94 std::string connection_state_;
97 std::string profile_path_; 95 std::string profile_path_;
98 std::string error_; 96 std::string error_;
99 bool auto_connect_; 97 bool auto_connect_;
100 bool favorite_; 98 bool favorite_;
101 int priority_; 99 int priority_;
100 // TODO(pneubeck): Remove this property once NetworkConfigurationHandler
101 // provides proxy configuration. crbug/241775
102 base::DictionaryValue proxy_config_;
102 // IPConfig properties. 103 // IPConfig properties.
103 // Note: These do not correspond to actual Shill.Service properties 104 // Note: These do not correspond to actual Shill.Service properties
104 // but are derived from the service's corresponding IPConfig object. 105 // but are derived from the service's corresponding IPConfig object.
105 std::string ip_address_; 106 std::string ip_address_;
106 std::vector<std::string> dns_servers_; 107 std::vector<std::string> dns_servers_;
107 // Wireless properties 108 // Wireless properties
108 int signal_strength_; 109 int signal_strength_;
109 bool connectable_; 110 bool connectable_;
110 // Wifi properties 111 // Wifi properties
111 std::string hex_ssid_; 112 std::string hex_ssid_;
112 std::string country_code_; 113 std::string country_code_;
113 bool passphrase_required_; 114 bool passphrase_required_;
114 // Cellular properties 115 // Cellular properties
115 std::string technology_; 116 std::string technology_;
116 std::string activation_state_; 117 std::string activation_state_;
117 std::string roaming_; 118 std::string roaming_;
118 bool activate_over_non_cellular_networks_; 119 bool activate_over_non_cellular_networks_;
119 bool cellular_out_of_credits_; 120 bool cellular_out_of_credits_;
120 121
121 DISALLOW_COPY_AND_ASSIGN(NetworkState); 122 DISALLOW_COPY_AND_ASSIGN(NetworkState);
122 }; 123 };
123 124
124 } // namespace chromeos 125 } // namespace chromeos
125 126
126 #endif // CHROMEOS_NETWORK_NETWORK_STATE_H_ 127 #endif // CHROMEOS_NETWORK_NETWORK_STATE_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698