| OLD | NEW |
| 1 // Copyright (c) 2010 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2010 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include "chrome/browser/dom_ui/options/core_options_handler.h" | 5 #include "chrome/browser/dom_ui/options/core_options_handler.h" |
| 6 | 6 |
| 7 #include "base/string16.h" | 7 #include "base/string16.h" |
| 8 #include "base/string_number_conversions.h" | 8 #include "base/string_number_conversions.h" |
| 9 #include "base/utf_string_conversions.h" | 9 #include "base/utf_string_conversions.h" |
| 10 #include "base/values.h" | 10 #include "base/values.h" |
| (...skipping 114 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 125 dom_ui_->RegisterMessageCallback("coreOptionsInitialize", | 125 dom_ui_->RegisterMessageCallback("coreOptionsInitialize", |
| 126 NewCallback(this, &CoreOptionsHandler::HandleInitialize)); | 126 NewCallback(this, &CoreOptionsHandler::HandleInitialize)); |
| 127 dom_ui_->RegisterMessageCallback("fetchPrefs", | 127 dom_ui_->RegisterMessageCallback("fetchPrefs", |
| 128 NewCallback(this, &CoreOptionsHandler::HandleFetchPrefs)); | 128 NewCallback(this, &CoreOptionsHandler::HandleFetchPrefs)); |
| 129 dom_ui_->RegisterMessageCallback("observePrefs", | 129 dom_ui_->RegisterMessageCallback("observePrefs", |
| 130 NewCallback(this, &CoreOptionsHandler::HandleObservePrefs)); | 130 NewCallback(this, &CoreOptionsHandler::HandleObservePrefs)); |
| 131 dom_ui_->RegisterMessageCallback("setBooleanPref", | 131 dom_ui_->RegisterMessageCallback("setBooleanPref", |
| 132 NewCallback(this, &CoreOptionsHandler::HandleSetBooleanPref)); | 132 NewCallback(this, &CoreOptionsHandler::HandleSetBooleanPref)); |
| 133 dom_ui_->RegisterMessageCallback("setIntegerPref", | 133 dom_ui_->RegisterMessageCallback("setIntegerPref", |
| 134 NewCallback(this, &CoreOptionsHandler::HandleSetIntegerPref)); | 134 NewCallback(this, &CoreOptionsHandler::HandleSetIntegerPref)); |
| 135 dom_ui_->RegisterMessageCallback("setRealPref", | 135 dom_ui_->RegisterMessageCallback("setDoublePref", |
| 136 NewCallback(this, &CoreOptionsHandler::HandleSetRealPref)); | 136 NewCallback(this, &CoreOptionsHandler::HandleSetDoublePref)); |
| 137 dom_ui_->RegisterMessageCallback("setStringPref", | 137 dom_ui_->RegisterMessageCallback("setStringPref", |
| 138 NewCallback(this, &CoreOptionsHandler::HandleSetStringPref)); | 138 NewCallback(this, &CoreOptionsHandler::HandleSetStringPref)); |
| 139 dom_ui_->RegisterMessageCallback("setObjectPref", | 139 dom_ui_->RegisterMessageCallback("setObjectPref", |
| 140 NewCallback(this, &CoreOptionsHandler::HandleSetObjectPref)); | 140 NewCallback(this, &CoreOptionsHandler::HandleSetObjectPref)); |
| 141 dom_ui_->RegisterMessageCallback("clearPref", | 141 dom_ui_->RegisterMessageCallback("clearPref", |
| 142 NewCallback(this, &CoreOptionsHandler::HandleClearPref)); | 142 NewCallback(this, &CoreOptionsHandler::HandleClearPref)); |
| 143 dom_ui_->RegisterMessageCallback("coreOptionsUserMetricsAction", | 143 dom_ui_->RegisterMessageCallback("coreOptionsUserMetricsAction", |
| 144 NewCallback(this, &CoreOptionsHandler::HandleUserMetricsAction)); | 144 NewCallback(this, &CoreOptionsHandler::HandleUserMetricsAction)); |
| 145 } | 145 } |
| 146 | 146 |
| (...skipping 34 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 181 pref_service->SetBoolean(pref_name.c_str(), value_string == "true"); | 181 pref_service->SetBoolean(pref_name.c_str(), value_string == "true"); |
| 182 break; | 182 break; |
| 183 | 183 |
| 184 case Value::TYPE_INTEGER: | 184 case Value::TYPE_INTEGER: |
| 185 int int_value; | 185 int int_value; |
| 186 CHECK(base::StringToInt(value_string, &int_value)); | 186 CHECK(base::StringToInt(value_string, &int_value)); |
| 187 pref_service->SetInteger(pref_name.c_str(), int_value); | 187 pref_service->SetInteger(pref_name.c_str(), int_value); |
| 188 | 188 |
| 189 break; | 189 break; |
| 190 | 190 |
| 191 case Value::TYPE_REAL: | 191 case Value::TYPE_DOUBLE: |
| 192 double double_value; | 192 double double_value; |
| 193 CHECK(base::StringToDouble(value_string, &double_value)); | 193 CHECK(base::StringToDouble(value_string, &double_value)); |
| 194 pref_service->SetReal(pref_name.c_str(), double_value); | 194 pref_service->SetDouble(pref_name.c_str(), double_value); |
| 195 | 195 |
| 196 break; | 196 break; |
| 197 | 197 |
| 198 case Value::TYPE_STRING: | 198 case Value::TYPE_STRING: |
| 199 pref_service->SetString(pref_name.c_str(), value_string); | 199 pref_service->SetString(pref_name.c_str(), value_string); |
| 200 break; | 200 break; |
| 201 | 201 |
| 202 default: | 202 default: |
| 203 NOTREACHED(); | 203 NOTREACHED(); |
| 204 return; | 204 return; |
| (...skipping 97 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 302 } | 302 } |
| 303 | 303 |
| 304 void CoreOptionsHandler::HandleSetBooleanPref(const ListValue* args) { | 304 void CoreOptionsHandler::HandleSetBooleanPref(const ListValue* args) { |
| 305 HandleSetPref(args, Value::TYPE_BOOLEAN); | 305 HandleSetPref(args, Value::TYPE_BOOLEAN); |
| 306 } | 306 } |
| 307 | 307 |
| 308 void CoreOptionsHandler::HandleSetIntegerPref(const ListValue* args) { | 308 void CoreOptionsHandler::HandleSetIntegerPref(const ListValue* args) { |
| 309 HandleSetPref(args, Value::TYPE_INTEGER); | 309 HandleSetPref(args, Value::TYPE_INTEGER); |
| 310 } | 310 } |
| 311 | 311 |
| 312 void CoreOptionsHandler::HandleSetRealPref(const ListValue* args) { | 312 void CoreOptionsHandler::HandleSetDoublePref(const ListValue* args) { |
| 313 HandleSetPref(args, Value::TYPE_REAL); | 313 HandleSetPref(args, Value::TYPE_DOUBLE); |
| 314 } | 314 } |
| 315 | 315 |
| 316 void CoreOptionsHandler::HandleSetStringPref(const ListValue* args) { | 316 void CoreOptionsHandler::HandleSetStringPref(const ListValue* args) { |
| 317 HandleSetPref(args, Value::TYPE_STRING); | 317 HandleSetPref(args, Value::TYPE_STRING); |
| 318 } | 318 } |
| 319 | 319 |
| 320 void CoreOptionsHandler::HandleSetObjectPref(const ListValue* args) { | 320 void CoreOptionsHandler::HandleSetObjectPref(const ListValue* args) { |
| 321 HandleSetPref(args, Value::TYPE_NULL); | 321 HandleSetPref(args, Value::TYPE_NULL); |
| 322 } | 322 } |
| 323 | 323 |
| (...skipping 50 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 374 | 374 |
| 375 DictionaryValue* dict = new DictionaryValue; | 375 DictionaryValue* dict = new DictionaryValue; |
| 376 dict->Set("value", pref->GetValue()->DeepCopy()); | 376 dict->Set("value", pref->GetValue()->DeepCopy()); |
| 377 dict->SetBoolean("managed", pref->IsManaged()); | 377 dict->SetBoolean("managed", pref->IsManaged()); |
| 378 result_value.Append(dict); | 378 result_value.Append(dict); |
| 379 | 379 |
| 380 dom_ui_->CallJavascriptFunction(callback_function, result_value); | 380 dom_ui_->CallJavascriptFunction(callback_function, result_value); |
| 381 } | 381 } |
| 382 } | 382 } |
| 383 } | 383 } |
| OLD | NEW |