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

Unified Diff: chromeos/network/network_state.h

Issue 14846004: Migrate ProxyConfigServiceImpl to NetworkStateHandler and NetworkProfileHandler. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Renamed ConfigStateToString. 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 side-by-side diff with in-line comments
Download patch
Index: chromeos/network/network_state.h
diff --git a/chromeos/network/network_state.h b/chromeos/network/network_state.h
index 578c95890ca17ab6cb124ce14ceb2063afd27b7f..81ac7694f0b118b4a2e6d7df2667f68e6f6b86f6 100644
--- a/chromeos/network/network_state.h
+++ b/chromeos/network/network_state.h
@@ -10,6 +10,7 @@
#include "base/values.h"
#include "chromeos/network/managed_state.h"
+#include "chromeos/network/onc/onc_constants.h"
namespace chromeos {
@@ -47,6 +48,7 @@ class CHROMEOS_EXPORT NetworkState : public ManagedState {
bool favorite() const { return favorite_; }
int priority() const { return priority_; }
const base::DictionaryValue& proxy_config() const { return proxy_config_; }
+ onc::ONCSource onc_source() const { return onc_source_; }
// Wireless property accessors
int signal_strength() const { return signal_strength_; }
bool connectable() const { return connectable_; }
@@ -100,9 +102,10 @@ class CHROMEOS_EXPORT NetworkState : public ManagedState {
bool auto_connect_;
bool favorite_;
int priority_;
- // TODO(pneubeck): Remove this property once NetworkConfigurationHandler
- // provides proxy configuration. crbug/241775
+ // TODO(pneubeck): Remove ProxyConfig and ONCSource once
+ // NetworkConfigurationHandler provides proxy configuration. crbug/241775
base::DictionaryValue proxy_config_;
+ onc::ONCSource onc_source_;
// IPConfig properties.
// Note: These do not correspond to actual Shill.Service properties
// but are derived from the service's corresponding IPConfig object.

Powered by Google App Engine
This is Rietveld 408576698