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

Unified Diff: chromeos/network/network_state.cc

Issue 14846004: Migrate ProxyConfigServiceImpl to NetworkStateHandler and NetworkProfileHandler. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Rebased. 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.cc
diff --git a/chromeos/network/network_state.cc b/chromeos/network/network_state.cc
index 7092c2170bc4e818ef24decbd9cc8ab50edd877b..a202d14d28a02a6ad834a08d7e5ff5f278717b86 100644
--- a/chromeos/network/network_state.cc
+++ b/chromeos/network/network_state.cc
@@ -58,6 +58,7 @@ NetworkState::NetworkState(const std::string& path)
auto_connect_(false),
favorite_(false),
priority_(0),
+ onc_source_(onc::ONC_SOURCE_NONE),
signal_strength_(0),
connectable_(false),
passphrase_required_(false),
@@ -167,6 +168,11 @@ void NetworkState::GetProperties(base::DictionaryValue* dictionary) const {
favorite_);
dictionary->SetIntegerWithoutPathExpansion(flimflam::kPriorityProperty,
priority_);
+ // Proxy config and ONC source is intentionally omitted: These properties are
+ // placed in NetworkState to transition ProxyConfigServiceImpl from
+ // NetworkLibrary to the new network stack. The networking extension API
+ // shouldn't depend on this member. Once ManagedNetworkConfigurationHandler
+ // is used instead of NetworkLibrary, we can remove them again.
dictionary->SetStringWithoutPathExpansion(
flimflam::kNetworkTechnologyProperty,
technology_);

Powered by Google App Engine
This is Rietveld 408576698