| Index: chrome/browser/chromeos/proxy_config_service_impl.h
|
| diff --git a/chrome/browser/chromeos/proxy_config_service_impl.h b/chrome/browser/chromeos/proxy_config_service_impl.h
|
| index fc0109fcb71d6e4108e80295ba76618519402f8e..4b46a9797b445e1180da4dea2e32977755bbafc9 100644
|
| --- a/chrome/browser/chromeos/proxy_config_service_impl.h
|
| +++ b/chrome/browser/chromeos/proxy_config_service_impl.h
|
| @@ -35,7 +35,7 @@ namespace chromeos {
|
| // any network (either currently active or non-active) on UI thread
|
| class ProxyConfigServiceImpl
|
| : public base::RefCountedThreadSafe<ProxyConfigServiceImpl>,
|
| - public SignedSettings::Delegate<std::string>,
|
| + public SignedSettings::Delegate<const base::Value&>,
|
| public NetworkLibrary::NetworkManagerObserver,
|
| public NetworkLibrary::NetworkObserver {
|
| public:
|
| @@ -232,13 +232,14 @@ class ProxyConfigServiceImpl
|
|
|
| // Implementation for SignedSettings::Delegate
|
| virtual void OnSettingsOpCompleted(SignedSettings::ReturnCode code,
|
| - std::string value);
|
| + const base::Value& value) OVERRIDE;
|
|
|
| // NetworkLibrary::NetworkManagerObserver implementation.
|
| - virtual void OnNetworkManagerChanged(NetworkLibrary* cros);
|
| + virtual void OnNetworkManagerChanged(NetworkLibrary* cros) OVERRIDE;
|
|
|
| // NetworkLibrary::NetworkObserver implementation.
|
| - virtual void OnNetworkChanged(NetworkLibrary* cros, const Network* network);
|
| + virtual void OnNetworkChanged(NetworkLibrary* cros,
|
| + const Network* network) OVERRIDE;
|
|
|
| #if defined(UNIT_TEST)
|
| void SetTesting() {
|
|
|