| 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..7faf0d47543f5015260a9b6496d584d97fdcc304 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 {
|
| + // TODO(pastarmovj): This is not used now but if it ever should be used it
|
| + // needs to fetch the status from the ProxyConfigService.
|
| + NOTREACHED();
|
| + return true;
|
| }
|
|
|
| bool ProxyCrosSettingsProvider::HandlesSetting(const std::string& path) const {
|
|
|