more changes

chrome/browser/ui/webui/options/font_settings_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/font_settings_handler.h"
 
 #include <string>
 
 #include "base/basictypes.h"
 #include "base/bind.h"
@@ skipping 109 matching lines @@
 
   std::vector<CharacterEncoding::EncodingInfo>::const_iterator it;
   for (it = encodings->begin(); it != encodings->end(); ++it) {
     ListValue* option = new ListValue();
     if (it->encoding_id) {
       int cmd_id = it->encoding_id;
       std::string encoding =
       CharacterEncoding::GetCanonicalEncodingNameByCommandId(cmd_id);
       string16 name = it->encoding_display_name;
       base::i18n::AdjustStringForLocaleDirection(&name);
-      option->Append(Value::CreateStringValue(encoding));
-      option->Append(Value::CreateStringValue(name));
+      option->Append(base::StringValue::New(encoding));
+      option->Append(base::StringValue::New(name));
     } else {
       // Add empty name/value to indicate a separator item.
-      option->Append(Value::CreateStringValue(""));
-      option->Append(Value::CreateStringValue(""));
+      option->Append(base::StringValue::New(""));
+      option->Append(base::StringValue::New(""));
     }
     encoding_list.Append(option);
   }
 
   ListValue selected_values;
-  selected_values.Append(Value::CreateStringValue(standard_font_.GetValue()));
-  selected_values.Append(Value::CreateStringValue(serif_font_.GetValue()));
-  selected_values.Append(Value::CreateStringValue(sans_serif_font_.GetValue()));
-  selected_values.Append(Value::CreateStringValue(fixed_font_.GetValue()));
-  selected_values.Append(Value::CreateStringValue(font_encoding_.GetValue()));
+  selected_values.Append(base::StringValue::New(standard_font_.GetValue()));
+  selected_values.Append(base::StringValue::New(serif_font_.GetValue()));
+  selected_values.Append(base::StringValue::New(sans_serif_font_.GetValue()));
+  selected_values.Append(base::StringValue::New(fixed_font_.GetValue()));
+  selected_values.Append(base::StringValue::New(font_encoding_.GetValue()));
 
   web_ui_->CallJavascriptFunction("FontSettings.setFontsData",
                                   *list->list.get(), encoding_list,
                                   selected_values);
 }
 
 void FontSettingsHandler::Observe(int type,
                                   const NotificationSource& source,
                                   const NotificationDetails& details) {
   if (type == chrome::NOTIFICATION_PREF_CHANGED) {
@@ skipping 12 matching lines @@
       SetUpSerifFontSample();
       SetUpSansSerifFontSample();
     } else if (*pref_name == prefs::kWebKitMinimumFontSize) {
       SetUpMinimumFontSample();
     }
   }
 }
 
 void FontSettingsHandler::SetUpStandardFontSample() {
   base::StringValue font_value(standard_font_.GetValue());
-  base::FundamentalValue size_value(default_font_size_.GetValue());
+  base::NumberValue size_value(default_font_size_.GetValue());
   web_ui_->CallJavascriptFunction(
       "FontSettings.setUpStandardFontSample", font_value, size_value);
 }
 
 void FontSettingsHandler::SetUpSerifFontSample() {
   base::StringValue font_value(serif_font_.GetValue());
-  base::FundamentalValue size_value(default_font_size_.GetValue());
+  base::NumberValue size_value(default_font_size_.GetValue());
   web_ui_->CallJavascriptFunction(
       "FontSettings.setUpSerifFontSample", font_value, size_value);
 }
 
 void FontSettingsHandler::SetUpSansSerifFontSample() {
   base::StringValue font_value(sans_serif_font_.GetValue());
-  base::FundamentalValue size_value(default_font_size_.GetValue());
+  base::NumberValue size_value(default_font_size_.GetValue());
   web_ui_->CallJavascriptFunction(
       "FontSettings.setUpSansSerifFontSample", font_value, size_value);
 }
 
 void FontSettingsHandler::SetUpFixedFontSample() {
   base::StringValue font_value(fixed_font_.GetValue());
-  base::FundamentalValue size_value(default_fixed_font_size_.GetValue());
+  base::NumberValue size_value(default_fixed_font_size_.GetValue());
   web_ui_->CallJavascriptFunction(
       "FontSettings.setUpFixedFontSample", font_value, size_value);
 }
 
 void FontSettingsHandler::SetUpMinimumFontSample() {
-  base::FundamentalValue size_value(minimum_font_size_.GetValue());
+  base::NumberValue size_value(minimum_font_size_.GetValue());
   web_ui_->CallJavascriptFunction("FontSettings.setUpMinimumFontSample",
                                   size_value);
 }