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

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: Initial patch. 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 1e89638961f78c716dbf5992b0f6509c6a86f522..6d73b8a4f0ccb33935dcdf8f134f935bba0fbbdc 100644
--- a/chromeos/network/network_state.h
+++ b/chromeos/network/network_state.h
@@ -8,11 +8,9 @@
#include <string>
#include <vector>
+#include "base/values.h"
#include "chromeos/network/managed_state.h"
-
-namespace base {
-class DictionaryValue;
-}
+#include "chromeos/network/onc/onc_constants.h"
namespace chromeos {
@@ -49,6 +47,8 @@ class CHROMEOS_EXPORT NetworkState : public ManagedState {
bool auto_connect() const { return auto_connect_; }
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_; }
// Cellular property accessors
@@ -96,6 +96,8 @@ class CHROMEOS_EXPORT NetworkState : public ManagedState {
bool auto_connect_;
bool favorite_;
int priority_;
+ 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