Index: chrome/browser/chromeos/proxy_cros_settings_provider.cc |
diff --git a/chrome/browser/chromeos/proxy_cros_settings_provider.cc b/chrome/browser/chromeos/proxy_cros_settings_provider.cc |
index 58fb046390e93449a8a1eaae8b12c4c5ba9a920b..3e20ddceea3b4154201cf54e81cd913cd5ce76f5 100644 |
--- a/chrome/browser/chromeos/proxy_cros_settings_provider.cc |
+++ b/chrome/browser/chromeos/proxy_cros_settings_provider.cc |
@@ -231,10 +231,8 @@ void ProxyCrosSettingsProvider::DoSet(const std::string& path, |
} |
} |
-bool ProxyCrosSettingsProvider::Get(const std::string& path, |
- Value** out_value) const { |
+const Value* ProxyCrosSettingsProvider::Get(const std::string& path) const { |
bool found = false; |
- bool managed = false; |
Value* data = NULL; |
chromeos::ProxyConfigServiceImpl* config_service = GetConfigService(); |
chromeos::ProxyConfigServiceImpl::ProxyConfig config; |
@@ -303,21 +301,23 @@ bool ProxyCrosSettingsProvider::Get(const std::string& path, |
for (size_t x = 0; x < bypass_rules.size(); x++) { |
list->Append(Value::CreateStringValue(bypass_rules[x]->ToString())); |
} |
- *out_value = list; |
- return true; |
+ return list; |
} |
if (found) { |
- DictionaryValue* dict = new DictionaryValue; |
if (!data) |
data = Value::CreateStringValue(""); |
- dict->Set("value", data); |
- dict->SetBoolean("managed", managed); |
- *out_value = dict; |
- return true; |
- } else { |
- *out_value = NULL; |
- return false; |
+ return data; |
} |
+ return NULL; |
+} |
+ |
+bool ProxyCrosSettingsProvider::GetTrusted( |
+ const std::string& path, |
+ const base::Closure& callback) const { |
+ // This will bounce the query to UserCrosSettingsProvider until |
+ // ProxyConfigService can report this too. |
+ // TODO(pastarmovj): Extend ProxyConfigService to support this kind of query. |
+ return CrosSettings::Get()->GetTrusted(kAccountsPrefAllowGuest, callback); |
Mattias Nissler (ping if slow)
2011/09/26 17:26:37
This is not correct either, since we might also be
pastarmovj
2011/09/29 15:15:03
Done.
|
} |
bool ProxyCrosSettingsProvider::HandlesSetting(const std::string& path) const { |