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

Unified Diff: chrome/browser/chromeos/proxy_config_service_impl.cc

Issue 5671003: [Chrome OS] Plumb new error codes from SignedSettings to consumers of the API (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: remove untoward log statement Created 10 years 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: 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 -------------------
« no previous file with comments | « chrome/browser/chromeos/proxy_config_service_impl.h ('k') | chrome/browser/chromeos/user_cros_settings_provider.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698