| Index: chrome/browser/chromeos/proxy_config_service_impl.cc
|
| diff --git a/chrome/browser/chromeos/proxy_config_service_impl.cc b/chrome/browser/chromeos/proxy_config_service_impl.cc
|
| index 2d272dfe917484de5c97751a9821510cf4ce8d21..862459c8f9867359d481542a13b7720302ab2522 100644
|
| --- a/chrome/browser/chromeos/proxy_config_service_impl.cc
|
| +++ b/chrome/browser/chromeos/proxy_config_service_impl.cc
|
| @@ -489,36 +489,34 @@ bool ProxyConfigServiceImpl::IOGetProxyConfig(net::ProxyConfig* net_config) {
|
| return false;
|
| }
|
|
|
| -void ProxyConfigServiceImpl::OnSettingsOpSucceeded(bool value) {
|
| - VLOG(1) << "Stored proxy setting to device";
|
| +void ProxyConfigServiceImpl::OnSettingsOpCompleted(
|
| + SignedSettings::ReturnCode code,
|
| + bool value) {
|
| + if (SignedSettings::SUCCESS == code)
|
| + VLOG(1) << "Stored proxy setting to device";
|
| + else
|
| + LOG(WARNING) << "Error storing proxy setting to device";
|
| store_property_op_ = NULL;
|
| if (persist_to_device_pending_)
|
| PersistConfigToDevice();
|
| }
|
|
|
| -void ProxyConfigServiceImpl::OnSettingsOpSucceeded(std::string value) {
|
| - VLOG(1) << "Retrieved proxy setting from device, value=[" << value << "]";
|
| - if (reference_config_.Deserialize(value)) {
|
| - OnUISetProxyConfig(false);
|
| +void ProxyConfigServiceImpl::OnSettingsOpCompleted(
|
| + SignedSettings::ReturnCode code,
|
| + std::string value) {
|
| + if (SignedSettings::SUCCESS == code) {
|
| + VLOG(1) << "Retrieved proxy setting from device, value=[" << value << "]";
|
| + if (reference_config_.Deserialize(value)) {
|
| + OnUISetProxyConfig(false);
|
| + } else {
|
| + LOG(WARNING) << "Error deserializing device's proxy setting";
|
| + InitConfigToDefault(true);
|
| + }
|
| } else {
|
| - LOG(WARNING) << "Error deserializing device's proxy setting";
|
| - InitConfigToDefault(true);
|
| - }
|
| - retrieve_property_op_ = NULL;
|
| -}
|
| -
|
| -void ProxyConfigServiceImpl::OnSettingsOpFailed(
|
| - SignedSettings::FailureCode code) {
|
| - if (retrieve_property_op_) {
|
| LOG(WARNING) << "Error retrieving proxy setting from device";
|
| InitConfigToDefault(true);
|
| - retrieve_property_op_ = NULL;
|
| - } else {
|
| - LOG(WARNING) << "Error storing proxy setting to device";
|
| - store_property_op_ = NULL;
|
| - if (persist_to_device_pending_)
|
| - PersistConfigToDevice();
|
| }
|
| + retrieve_property_op_ = NULL;
|
| }
|
|
|
| //------------------ ProxyConfigServiceImpl: private methods -------------------
|
|
|