more changes

chrome/browser/ui/webui/options/personal_options_handler.cc

 // Copyright (c) 2011 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/ui/webui/options/personal_options_handler.h"
 
 #include <string>
 
 #include "base/basictypes.h"
 #include "base/callback.h"
@@ skipping 129 matching lines @@
 #else
   localized_strings->SetString("themes",
       l10n_util::GetStringUTF16(IDS_THEMES_GROUP_NAME));
   localized_strings->SetString("themesReset",
       l10n_util::GetStringUTF16(IDS_THEMES_RESET_BUTTON));
 #endif
 
   // 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);
 
   // Sync page.
   localized_strings->SetString("syncPage",
       l10n_util::GetStringUTF16(IDS_SYNC_NTP_SYNC_SECTION_TITLE));
   localized_strings->SetString("sync_title",
       l10n_util::GetStringUTF16(IDS_CUSTOMIZE_SYNC_DESCRIPTION));
   localized_strings->SetString("syncsettings",
@@ skipping 105 matching lines @@
         l10n_util::GetStringUTF16(IDS_SYNC_NTP_SETUP_IN_PROGRESS);
     is_start_stop_button_visible = true;
     is_start_stop_button_enabled = false;
   } else {
     start_stop_button_label =
         l10n_util::GetStringUTF16(IDS_SYNC_START_SYNC_BUTTON_LABEL);
     is_start_stop_button_visible = true;
     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_)
     SendProfilesInfo();
 }
 
 void PersonalOptionsHandler::OnLoginSuccess() {
   OnStateChanged();
 }
 
 void PersonalOptionsHandler::OnLoginFailure(
     const GoogleServiceAuthError& error) {
   OnStateChanged();
 }
 
 void PersonalOptionsHandler::ObserveThemeChanged() {
   Profile* profile = Profile::FromWebUI(web_ui_);
 #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
   ThemeService* theme_service = ThemeServiceFactory::GetForProfile(profile);
   bool is_gtk_theme = false;
 #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);
 }
 
 void PersonalOptionsHandler::Initialize() {
   Profile* profile = Profile::FromWebUI(web_ui_);
 
   // Listen for theme installation.
   registrar_.Add(this, chrome::NOTIFICATION_BROWSER_THEME_CHANGED,
                  Source<ThemeService>(ThemeServiceFactory::GetForProfile(
@@ skipping 71 matching lines @@
   }
 
   web_ui_->CallJavascriptFunction("PersonalOptions.setProfilesInfo",
                                   profile_info_list);
 }
 
 void PersonalOptionsHandler::CreateProfile(const ListValue* args) {
   ProfileManager::CreateMultiProfileAsync();
 }