| Index: chrome/browser/ui/webui/options/core_options_handler.cc
|
| diff --git a/chrome/browser/ui/webui/options/core_options_handler.cc b/chrome/browser/ui/webui/options/core_options_handler.cc
|
| index b0853c49bbac7947e742ffc4ce439dd1927785e3..bd649f92d14b4e2f4f62200d9d8a30fbebb1a492 100644
|
| --- a/chrome/browser/ui/webui/options/core_options_handler.cc
|
| +++ b/chrome/browser/ui/webui/options/core_options_handler.cc
|
| @@ -157,7 +157,7 @@ Value* CoreOptionsHandler::FetchPref(const std::string& pref_name) {
|
| const PrefService::Preference* pref =
|
| pref_service->FindPreference(pref_name.c_str());
|
| if (!pref)
|
| - return Value::CreateNullValue();
|
| + return base::NullValue();
|
|
|
| return CreateValueForPref(pref);
|
| }
|
| @@ -321,7 +321,7 @@ void CoreOptionsHandler::HandleSetPref(const ListValue* args,
|
| if (type == Value::TYPE_INTEGER) {
|
| double double_value;
|
| CHECK(value->GetAsDouble(&double_value));
|
| - temp_value.reset(Value::CreateIntegerValue(static_cast<int>(double_value)));
|
| + temp_value.reset(base::NumberValue::New(static_cast<int>(double_value)));
|
| value = temp_value.get();
|
|
|
| // In case we have a List pref we got a JSON string.
|
| @@ -365,7 +365,7 @@ void CoreOptionsHandler::HandleUserMetricsAction(const ListValue* args) {
|
|
|
| void CoreOptionsHandler::UpdateClearPluginLSOData() {
|
| scoped_ptr<Value> enabled(
|
| - Value::CreateBooleanValue(clear_plugin_lso_data_enabled_.GetValue()));
|
| + base::BooleanValue::New(clear_plugin_lso_data_enabled_.GetValue()));
|
| web_ui_->CallJavascriptFunction(
|
| "OptionsPage.setClearPluginLSODataEnabled", *enabled);
|
| }
|
| @@ -390,7 +390,7 @@ void CoreOptionsHandler::NotifyPrefChanged(const std::string* pref_name) {
|
| iter != range.second; ++iter) {
|
| const std::wstring& callback_function = iter->second;
|
| ListValue result_value;
|
| - result_value.Append(Value::CreateStringValue(pref_name->c_str()));
|
| + result_value.Append(base::StringValue::New(pref_name->c_str()));
|
|
|
| result_value.Append(CreateValueForPref(pref));
|
|
|
|
|