| Index: chrome/browser/ui/webui/options/font_settings_handler.cc
|
| diff --git a/chrome/browser/ui/webui/options/font_settings_handler.cc b/chrome/browser/ui/webui/options/font_settings_handler.cc
|
| index f57a800f98bb9e99ccca75de4479b69fb87095cc..5eeb8a295348634f748bdfef173734310f606b61 100644
|
| --- a/chrome/browser/ui/webui/options/font_settings_handler.cc
|
| +++ b/chrome/browser/ui/webui/options/font_settings_handler.cc
|
| @@ -206,7 +206,7 @@ void FontSettingsHandler::FontsListHasLoaded(
|
| }
|
|
|
| void FontSettingsHandler::SetUpStandardFontSample() {
|
| - base::StringValue font_value(
|
| + base::Value font_value(
|
| FontSettingsUtilities::ResolveFontList(standard_font_.GetValue()));
|
| base::Value size_value(default_font_size_.GetValue());
|
| web_ui()->CallJavascriptFunctionUnsafe("FontSettings.setUpStandardFontSample",
|
| @@ -214,7 +214,7 @@ void FontSettingsHandler::SetUpStandardFontSample() {
|
| }
|
|
|
| void FontSettingsHandler::SetUpSerifFontSample() {
|
| - base::StringValue font_value(
|
| + base::Value font_value(
|
| FontSettingsUtilities::ResolveFontList(serif_font_.GetValue()));
|
| base::Value size_value(default_font_size_.GetValue());
|
| web_ui()->CallJavascriptFunctionUnsafe("FontSettings.setUpSerifFontSample",
|
| @@ -222,7 +222,7 @@ void FontSettingsHandler::SetUpSerifFontSample() {
|
| }
|
|
|
| void FontSettingsHandler::SetUpSansSerifFontSample() {
|
| - base::StringValue font_value(
|
| + base::Value font_value(
|
| FontSettingsUtilities::ResolveFontList(sans_serif_font_.GetValue()));
|
| base::Value size_value(default_font_size_.GetValue());
|
| web_ui()->CallJavascriptFunctionUnsafe(
|
| @@ -230,7 +230,7 @@ void FontSettingsHandler::SetUpSansSerifFontSample() {
|
| }
|
|
|
| void FontSettingsHandler::SetUpFixedFontSample() {
|
| - base::StringValue font_value(
|
| + base::Value font_value(
|
| FontSettingsUtilities::ResolveFontList(fixed_font_.GetValue()));
|
| base::Value size_value(default_fixed_font_size_.GetValue());
|
| web_ui()->CallJavascriptFunctionUnsafe("FontSettings.setUpFixedFontSample",
|
|
|