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

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: Rebased. Created 7 years, 6 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
« no previous file with comments | « chrome/chrome_browser_chromeos.gypi ('k') | chromeos/network/network_state.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chromeos/network/network_state.h
diff --git a/chromeos/network/network_state.h b/chromeos/network/network_state.h
index 4718820d8209467a73c5fe6bf5bddf53b90574f1..31ea5f9d04b0ab50ebb53f68c34922c50ea04fb1 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 {
@@ -48,6 +49,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_; }
@@ -102,9 +104,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.
« 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