Index: chrome/browser/ui/webui/options/personal_options_handler.cc |
diff --git a/chrome/browser/ui/webui/options/personal_options_handler.cc b/chrome/browser/ui/webui/options/personal_options_handler.cc |
index f273c6b31b34a4526260d663a78a6b672cf48fd3..84151b6cae0872e92e972fc7f468c211b5db7f35 100644 |
--- a/chrome/browser/ui/webui/options/personal_options_handler.cc |
+++ b/chrome/browser/ui/webui/options/personal_options_handler.cc |
@@ -147,15 +147,15 @@ void PersonalOptionsHandler::GetLocalizedValues( |
// Sync select control. |
ListValue* sync_select_list = new ListValue; |
ListValue* datatypes = new ListValue; |
- datatypes->Append(Value::CreateBooleanValue(false)); |
+ datatypes->Append(base::FalseValue()); |
datatypes->Append( |
- Value::CreateStringValue( |
+ base::StringValue::New( |
l10n_util::GetStringUTF8(IDS_SYNC_OPTIONS_SELECT_DATATYPES))); |
sync_select_list->Append(datatypes); |
ListValue* everything = new ListValue; |
- everything->Append(Value::CreateBooleanValue(true)); |
+ everything->Append(base::TrueValue()); |
everything->Append( |
- Value::CreateStringValue( |
+ base::StringValue::New( |
l10n_util::GetStringUTF8(IDS_SYNC_OPTIONS_SELECT_EVERYTHING))); |
sync_select_list->Append(everything); |
localized_strings->Set("syncSelectList", sync_select_list); |
@@ -281,45 +281,45 @@ void PersonalOptionsHandler::OnStateChanged() { |
is_start_stop_button_enabled = !managed; |
} |
- scoped_ptr<Value> completed(Value::CreateBooleanValue(sync_setup_completed)); |
+ scoped_ptr<Value> completed(base::BooleanValue::New(sync_setup_completed)); |
web_ui_->CallJavascriptFunction("PersonalOptions.setSyncSetupCompleted", |
*completed); |
- scoped_ptr<Value> label(Value::CreateStringValue(status_label)); |
+ scoped_ptr<Value> label(base::StringValue::New(status_label)); |
web_ui_->CallJavascriptFunction("PersonalOptions.setSyncStatus", *label); |
scoped_ptr<Value> enabled( |
- Value::CreateBooleanValue(is_start_stop_button_enabled)); |
+ base::BooleanValue::New(is_start_stop_button_enabled)); |
web_ui_->CallJavascriptFunction("PersonalOptions.setStartStopButtonEnabled", |
*enabled); |
scoped_ptr<Value> visible( |
- Value::CreateBooleanValue(is_start_stop_button_visible)); |
+ base::BooleanValue::New(is_start_stop_button_visible)); |
web_ui_->CallJavascriptFunction("PersonalOptions.setStartStopButtonVisible", |
*visible); |
- label.reset(Value::CreateStringValue(start_stop_button_label)); |
+ label.reset(base::StringValue::New(start_stop_button_label)); |
web_ui_->CallJavascriptFunction("PersonalOptions.setStartStopButtonLabel", |
*label); |
- label.reset(Value::CreateStringValue(link_label)); |
+ label.reset(base::StringValue::New(link_label)); |
web_ui_->CallJavascriptFunction("PersonalOptions.setSyncActionLinkLabel", |
*label); |
- enabled.reset(Value::CreateBooleanValue(!managed)); |
+ enabled.reset(base::BooleanValue::New(!managed)); |
web_ui_->CallJavascriptFunction("PersonalOptions.setSyncActionLinkEnabled", |
*enabled); |
- visible.reset(Value::CreateBooleanValue(status_has_error)); |
+ visible.reset(base::BooleanValue::New(status_has_error)); |
web_ui_->CallJavascriptFunction("PersonalOptions.setSyncStatusErrorVisible", |
*visible); |
- visible.reset(Value::CreateBooleanValue(service->AreCredentialsAvailable())); |
+ visible.reset(base::BooleanValue::New(service->AreCredentialsAvailable())); |
web_ui_->CallJavascriptFunction("PersonalOptions.setAutoLoginVisible", |
*visible); |
// Set profile creation text and button if multi-profiles switch is on. |
- visible.reset(Value::CreateBooleanValue(multiprofile_)); |
+ visible.reset(base::BooleanValue::New(multiprofile_)); |
web_ui_->CallJavascriptFunction("PersonalOptions.setProfilesSectionVisible", |
*visible); |
if (multiprofile_) |
@@ -340,7 +340,7 @@ void PersonalOptionsHandler::ObserveThemeChanged() { |
#if defined(TOOLKIT_GTK) |
GtkThemeService* theme_service = GtkThemeService::GetFrom(profile); |
bool is_gtk_theme = theme_service->UsingNativeTheme(); |
- base::FundamentalValue gtk_enabled(!is_gtk_theme); |
+ base::BooleanValue gtk_enabled(!is_gtk_theme); |
web_ui_->CallJavascriptFunction( |
"options.PersonalOptions.setGtkThemeButtonEnabled", gtk_enabled); |
#else |
@@ -349,7 +349,7 @@ void PersonalOptionsHandler::ObserveThemeChanged() { |
#endif |
bool is_classic_theme = !is_gtk_theme && theme_service->UsingDefaultTheme(); |
- base::FundamentalValue enabled(!is_classic_theme); |
+ base::BooleanValue enabled(!is_classic_theme); |
web_ui_->CallJavascriptFunction( |
"options.PersonalOptions.setThemesResetButtonEnabled", enabled); |
} |