more changes

chrome/browser/ui/webui/options/advanced_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/advanced_options_handler.h"
 
 #include <string>
 
 #include "base/basictypes.h"
 #include "base/callback.h"
@@ skipping 437 matching lines @@
     const ListValue* args) {
   std::string checked_str = UTF16ToUTF8(ExtractStringValue(args));
   bool enabled = checked_str == "true";
   UserMetrics::RecordAction(enabled ?
       UserMetricsAction("Options_BackgroundMode_Enable") :
       UserMetricsAction("Options_BackgroundMode_Disable"));
   background_mode_enabled_.SetValue(enabled);
 }
 
 void AdvancedOptionsHandler::SetupBackgroundModeSettings() {
-    base::FundamentalValue checked(background_mode_enabled_.GetValue());
+    base::BooleanValue checked(background_mode_enabled_.GetValue());
     web_ui_->CallJavascriptFunction(
         "options.AdvancedOptions.SetBackgroundModeCheckboxState", checked);
 }
 #endif
 
 #if !defined(OS_CHROMEOS)
 void AdvancedOptionsHandler::ShowNetworkProxySettings(const ListValue* args) {
   UserMetrics::RecordAction(UserMetricsAction("Options_ShowProxySettings"));
   AdvancedOptionsUtilities::ShowNetworkProxySettings(web_ui_->tab_contents());
 }
@@ skipping 45 matching lines @@
   Profile* profile = Profile::FromWebUI(web_ui_);
   if (!CloudPrintProxyServiceFactory::GetForProfile(profile)) {
     cloud_print_proxy_ui_enabled_ = false;
     RemoveCloudPrintProxySection();
     return;
   }
 
   bool cloud_print_proxy_allowed =
       !cloud_print_proxy_enabled_.IsManaged() ||
       cloud_print_proxy_enabled_.GetValue();
-  base::FundamentalValue allowed(cloud_print_proxy_allowed);
+  base::BooleanValue allowed(cloud_print_proxy_allowed);
 
   std::string email;
   if (profile->GetPrefs()->HasPrefPath(prefs::kCloudPrintEmail) &&
       cloud_print_proxy_allowed) {
     email = profile->GetPrefs()->GetString(prefs::kCloudPrintEmail);
   }
-  base::FundamentalValue disabled(email.empty());
+  base::BooleanValue disabled(email.empty());
 
   string16 label_str;
   if (email.empty()) {
     label_str = l10n_util::GetStringUTF16(
         IDS_OPTIONS_CLOUD_PRINT_PROXY_DISABLED_LABEL);
   } else {
     label_str = l10n_util::GetStringFUTF16(
         IDS_OPTIONS_CLOUD_PRINT_PROXY_ENABLED_LABEL, UTF8ToUTF16(email));
   }
   StringValue label(label_str);
 
   web_ui_->CallJavascriptFunction(
       "options.AdvancedOptions.SetupCloudPrintProxySection",
       disabled, label, allowed);
 }
 
 void AdvancedOptionsHandler::RemoveCloudPrintProxySection() {
   web_ui_->CallJavascriptFunction(
       "options.AdvancedOptions.RemoveCloudPrintProxySection");
 }
 
 #endif
 
 void AdvancedOptionsHandler::SetupMetricsReportingCheckbox() {
 #if defined(GOOGLE_CHROME_BUILD) && !defined(OS_CHROMEOS)
-  base::FundamentalValue checked(enable_metrics_recording_.GetValue());
-  base::FundamentalValue disabled(enable_metrics_recording_.IsManaged());
+  base::BooleanValue checked(enable_metrics_recording_.GetValue());
+  base::BooleanValue disabled(enable_metrics_recording_.IsManaged());
   web_ui_->CallJavascriptFunction(
       "options.AdvancedOptions.SetMetricsReportingCheckboxState", checked,
       disabled);
 #endif
 }
 
 void AdvancedOptionsHandler::SetupMetricsReportingSettingVisibility() {
 #if defined(GOOGLE_CHROME_BUILD) && defined(OS_CHROMEOS)
   // Don't show the reporting setting if we are in the guest mode.
   if (CommandLine::ForCurrentProcess()->HasSwitch(switches::kGuestSession)) {
-    base::FundamentalValue visible(false);
+    base::BooleanValue visible(false);
     web_ui_->CallJavascriptFunction(
         "options.AdvancedOptions.SetMetricsReportingSettingVisibility",
         visible);
   }
 #endif
 }
 
 void AdvancedOptionsHandler::SetupFontSizeLabel() {
   // We're only interested in integer values, so convert to int.
-  base::FundamentalValue font_size(default_font_size_.GetValue());
+  base::NumberValue font_size(default_font_size_.GetValue());
   web_ui_->CallJavascriptFunction(
       "options.AdvancedOptions.SetFontSize", font_size);
 }
 
 void AdvancedOptionsHandler::SetupDownloadLocationPath() {
   StringValue value(default_download_location_.GetValue().value());
   // In case allow_file_selection_dialogs_ is false, we will not display any
   // file-selection dialogs but show an InfoBar. That is why we can disable
   // the DownloadLocationPath-Chooser right-away.
-  base::FundamentalValue disabled(default_download_location_.IsManaged() ||
+  base::BooleanValue disabled(default_download_location_.IsManaged() ||
                             !allow_file_selection_dialogs_.GetValue());
   web_ui_->CallJavascriptFunction(
       "options.AdvancedOptions.SetDownloadLocationPath", value, disabled);
 }
 
 void AdvancedOptionsHandler::SetupPromptForDownload() {
-  base::FundamentalValue checked(ask_for_save_location_.GetValue());
+  base::BooleanValue checked(ask_for_save_location_.GetValue());
   // If either the DownloadDirectory is managed or if file-selection dialogs are
   // disallowed then |ask_for_save_location_| must currently be false and cannot
   // be changed.
-  base::FundamentalValue disabled(default_download_location_.IsManaged() ||
+  base::BooleanValue disabled(default_download_location_.IsManaged() ||
                             !allow_file_selection_dialogs_.GetValue());
   web_ui_->CallJavascriptFunction(
       "options.AdvancedOptions.SetPromptForDownload", checked, disabled);
 }
 
 void AdvancedOptionsHandler::SetupAutoOpenFileTypesDisabledAttribute() {
   // Set the enabled state for the AutoOpenFileTypesResetToDefault button.
   // We enable the button if the user has any auto-open file types registered.
   DownloadManager* manager =
       web_ui_->tab_contents()->browser_context()->GetDownloadManager();
   bool disabled = !(manager && manager->download_prefs()->IsAutoOpenUsed());
-  base::FundamentalValue value(disabled);
+  base::BooleanValue value(disabled);
   web_ui_->CallJavascriptFunction(
       "options.AdvancedOptions.SetAutoOpenFileTypesDisabledAttribute", value);
 }
 
 void AdvancedOptionsHandler::SetupProxySettingsSection() {
   // Disable the button if proxy settings are managed by a sysadmin or
   // overridden by an extension.
   PrefService* pref_service = Profile::FromWebUI(web_ui_)->GetPrefs();
   const PrefService::Preference* proxy_config =
       pref_service->FindPreference(prefs::kProxy);
   bool is_extension_controlled = (proxy_config &&
                                   proxy_config->IsExtensionControlled());
 
-  base::FundamentalValue disabled(proxy_prefs_->IsManaged() ||
+  base::BooleanValue disabled(proxy_prefs_->IsManaged() ||
                             is_extension_controlled);
 
   // Get the appropriate info string to describe the button.
   string16 label_str;
   if (is_extension_controlled) {
     label_str = l10n_util::GetStringUTF16(IDS_OPTIONS_EXTENSION_PROXIES_LABEL);
   } else {
     label_str = l10n_util::GetStringFUTF16(IDS_OPTIONS_SYSTEM_PROXIES_LABEL,
         l10n_util::GetStringUTF16(IDS_PRODUCT_NAME));
   }
   StringValue label(label_str);
 
   web_ui_->CallJavascriptFunction(
       "options.AdvancedOptions.SetupProxySettingsSection", disabled, label);
 }
 
 void AdvancedOptionsHandler::SetupSSLConfigSettings() {
   {
-    base::FundamentalValue checked(rev_checking_enabled_.GetValue());
-    base::FundamentalValue disabled(rev_checking_enabled_.IsManaged());
+    base::BooleanValue checked(rev_checking_enabled_.GetValue());
+    base::BooleanValue disabled(rev_checking_enabled_.IsManaged());
     web_ui_->CallJavascriptFunction(
         "options.AdvancedOptions.SetCheckRevocationCheckboxState", checked,
         disabled);
   }
   {
-    base::FundamentalValue checked(ssl3_enabled_.GetValue());
-    base::FundamentalValue disabled(ssl3_enabled_.IsManaged());
+    base::BooleanValue checked(ssl3_enabled_.GetValue());
+    base::BooleanValue disabled(ssl3_enabled_.IsManaged());
     web_ui_->CallJavascriptFunction(
         "options.AdvancedOptions.SetUseSSL3CheckboxState", checked, disabled);
   }
   {
-    base::FundamentalValue checked(tls1_enabled_.GetValue());
-    base::FundamentalValue disabled(tls1_enabled_.IsManaged());
+    base::BooleanValue checked(tls1_enabled_.GetValue());
+    base::BooleanValue disabled(tls1_enabled_.IsManaged());
     web_ui_->CallJavascriptFunction(
         "options.AdvancedOptions.SetUseTLS1CheckboxState", checked, disabled);
   }
 }