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

Unified 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: Rebased on Gaurav's CL 15359008. 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 5ce82fbeaa9c3604f032112f091fd3501dd880ae..578c95890ca17ab6cb124ce14ceb2063afd27b7f 100644
--- a/chromeos/network/network_state.h
+++ b/chromeos/network/network_state.h
@@ -8,12 +8,9 @@
#include <string>
#include <vector>
+#include "base/values.h"
#include "chromeos/network/managed_state.h"
-namespace base {
-class DictionaryValue;
-}
-
namespace chromeos {
// Simple class to provide network state information about a network service.
@@ -45,11 +42,11 @@ class CHROMEOS_EXPORT NetworkState : public ManagedState {
const std::string& guid() const { return guid_; }
const std::string& connection_state() const { return connection_state_; }
const std::string& profile_path() const { return profile_path_; }
- const std::string& proxy_config() const { return proxy_config_; }
const std::string& error() const { return error_; }
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_; }
// Wireless property accessors
int signal_strength() const { return signal_strength_; }
bool connectable() const { return connectable_; }
@@ -99,11 +96,13 @@ class CHROMEOS_EXPORT NetworkState : public ManagedState {
std::string guid_;
std::string connection_state_;
std::string profile_path_;
- std::string proxy_config_;
std::string error_;
bool auto_connect_;
bool favorite_;
int priority_;
+ // TODO(pneubeck): Remove this property once NetworkConfigurationHandler
+ // provides proxy configuration. crbug/241775
+ base::DictionaryValue proxy_config_;
// 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