diff options
| author | kinaba@chromium.org <kinaba@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-11-15 02:22:19 +0000 |
|---|---|---|
| committer | kinaba@chromium.org <kinaba@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-11-15 02:22:19 +0000 |
| commit | c8c3f37f7dc08aee5f9199aa00a3c36c5403d9c5 (patch) | |
| tree | fe62f0694817ca5ecca557b667220039e5fc5101 /chrome/browser/chromeos/proxy_cros_settings_parser.cc | |
| parent | 953067b9f13194d1ac77fc8652cbf1b1066f765b (diff) | |
| download | chromium_src-c8c3f37f7dc08aee5f9199aa00a3c36c5403d9c5.zip chromium_src-c8c3f37f7dc08aee5f9199aa00a3c36c5403d9c5.tar.gz chromium_src-c8c3f37f7dc08aee5f9199aa00a3c36c5403d9c5.tar.bz2 | |
Revert 167808 - Get rid of use of CreateStringValue in chromeos/ directory.
Reverting because the patch makes clang build failing:
> chrome/browser/chromeos/cros/network_library.cc:380:26:error: C++98 requires an
> accessible copy constructor for class 'base::StringValue' when binding a
> reference to a temporary; was private [-Werror,-Wbind-to-temporary-copy]
> SetValueProperty(prop, base::StringValue(str));
etc.
BUG=160586
Review URL: https://chromiumcodereview.appspot.com/11363203
TBR=estade@chromium.org
Review URL: https://codereview.chromium.org/11369258
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@167826 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/chromeos/proxy_cros_settings_parser.cc')
| -rw-r--r-- | chrome/browser/chromeos/proxy_cros_settings_parser.cc | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/chrome/browser/chromeos/proxy_cros_settings_parser.cc b/chrome/browser/chromeos/proxy_cros_settings_parser.cc index 5dc5e27..2177095 100644 --- a/chrome/browser/chromeos/proxy_cros_settings_parser.cc +++ b/chrome/browser/chromeos/proxy_cros_settings_parser.cc @@ -56,7 +56,7 @@ namespace { base::Value* CreateServerHostValue( const ProxyConfigServiceImpl::ProxyConfig::ManualProxy& proxy) { return proxy.server.is_valid() ? - new base::StringValue(proxy.server.host_port_pair().host()) : + base::Value::CreateStringValue(proxy.server.host_port_pair().host()) : NULL; } @@ -298,7 +298,8 @@ bool GetProxyPrefValue(Profile* profile, if (config.mode == chromeos::ProxyConfigServiceImpl::ProxyConfig::MODE_PAC_SCRIPT && config.automatic_proxy.pac_url.is_valid()) { - data = new base::StringValue(config.automatic_proxy.pac_url.spec()); + data = + base::Value::CreateStringValue(config.automatic_proxy.pac_url.spec()); } } else if (path == kProxySingleHttp) { data = CreateServerHostValue(config.single_proxy); @@ -356,7 +357,7 @@ bool GetProxyPrefValue(Profile* profile, ListValue* list = new ListValue(); net::ProxyBypassRules::RuleList bypass_rules = config.bypass_rules.rules(); for (size_t x = 0; x < bypass_rules.size(); x++) { - list->Append(new base::StringValue(bypass_rules[x]->ToString())); + list->Append(base::Value::CreateStringValue(bypass_rules[x]->ToString())); } data = list; } else { @@ -367,7 +368,7 @@ bool GetProxyPrefValue(Profile* profile, // Decorate pref value as CoreOptionsHandler::CreateValueForPref() does. DictionaryValue* dict = new DictionaryValue; if (!data) - data = new base::StringValue(""); + data = base::Value::CreateStringValue(""); dict->Set("value", data); if (path == kProxyType) { dict->SetString("controlledBy", controlled_by); |