Move code for old, deprecated Options UI to only ChromeOS

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

 // Copyright (c) 2012 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 <stddef.h>
 
 #include <string>
 #include <utility>
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/i18n/rtl.h"
 #include "base/macros.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/string_util.h"
 #include "base/strings/utf_string_conversions.h"
 #include "base/values.h"
 #include "build/build_config.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/extensions/extension_service.h"
 #include "chrome/browser/extensions/extension_tab_util.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ui/browser_finder.h"
-#include "chrome/browser/ui/webui/options/font_settings_utils.h"
+#include "chrome/browser/ui/webui/settings_utils.h"
 #include "chrome/common/pref_names.h"
 #include "chrome/grit/generated_resources.h"
 #include "components/prefs/pref_service.h"
 #include "content/public/browser/font_list_async.h"
 #include "content/public/browser/notification_details.h"
 #include "content/public/browser/notification_service.h"
 #include "content/public/browser/web_ui.h"
 #include "extensions/browser/extension_registry.h"
 #include "extensions/browser/extension_system.h"
 #include "extensions/common/extension.h"
@@ skipping 72 matching lines @@
   SetUpSerifFontSample();
   SetUpSansSerifFontSample();
   SetUpFixedFontSample();
   SetUpMinimumFontSample();
   NotifyAdvancedFontSettingsAvailability();
 }
 
 void FontSettingsHandler::RegisterMessages() {
   // Perform validation for saved fonts.
   PrefService* pref_service = Profile::FromWebUI(web_ui())->GetPrefs();
-  FontSettingsUtilities::ValidateSavedFonts(pref_service);
+  settings_utils::ValidateSavedFonts(pref_service);
 
   // Register for preferences that we need to observe manually.
   standard_font_.Init(prefs::kWebKitStandardFontFamily,
                       pref_service,
                       base::Bind(&FontSettingsHandler::SetUpStandardFontSample,
                                  base::Unretained(this)));
   serif_font_.Init(prefs::kWebKitSerifFontFamily,
                    pref_service,
                    base::Bind(&FontSettingsHandler::SetUpSerifFontSample,
                               base::Unretained(this)));
@@ skipping 55 matching lines @@
     bool has_font = list->GetList(i, &font);
     DCHECK(has_font);
     base::string16 value;
     bool has_value = font->GetString(1, &value);
     DCHECK(has_value);
     bool has_rtl_chars = base::i18n::StringContainsStrongRTLChars(value);
     font->AppendString(has_rtl_chars ? "rtl" : "ltr");
   }
 
   base::ListValue selected_values;
-  selected_values.AppendString(FontSettingsUtilities::MaybeGetLocalizedFontName(
-      standard_font_.GetValue()));
   selected_values.AppendString(
-      FontSettingsUtilities::MaybeGetLocalizedFontName(serif_font_.GetValue()));
-  selected_values.AppendString(FontSettingsUtilities::MaybeGetLocalizedFontName(
-      sans_serif_font_.GetValue()));
+      settings_utils::MaybeGetLocalizedFontName(standard_font_.GetValue()));
   selected_values.AppendString(
-      FontSettingsUtilities::MaybeGetLocalizedFontName(fixed_font_.GetValue()));
+      settings_utils::MaybeGetLocalizedFontName(serif_font_.GetValue()));
+  selected_values.AppendString(
+      settings_utils::MaybeGetLocalizedFontName(sans_serif_font_.GetValue()));
+  selected_values.AppendString(
+      settings_utils::MaybeGetLocalizedFontName(fixed_font_.GetValue()));
 
   web_ui()->CallJavascriptFunctionUnsafe(
       "FontSettings.setFontsData", *list.get(), selected_values);
 }
 
 void FontSettingsHandler::SetUpStandardFontSample() {
   base::Value font_value(
-      FontSettingsUtilities::ResolveFontList(standard_font_.GetValue()));
+      settings_utils::ResolveFontList(standard_font_.GetValue()));
   base::Value size_value(default_font_size_.GetValue());
   web_ui()->CallJavascriptFunctionUnsafe("FontSettings.setUpStandardFontSample",
                                          font_value, size_value);
 }
 
 void FontSettingsHandler::SetUpSerifFontSample() {
   base::Value font_value(
-      FontSettingsUtilities::ResolveFontList(serif_font_.GetValue()));
+      settings_utils::ResolveFontList(serif_font_.GetValue()));
   base::Value size_value(default_font_size_.GetValue());
   web_ui()->CallJavascriptFunctionUnsafe("FontSettings.setUpSerifFontSample",
                                          font_value, size_value);
 }
 
 void FontSettingsHandler::SetUpSansSerifFontSample() {
   base::Value font_value(
-      FontSettingsUtilities::ResolveFontList(sans_serif_font_.GetValue()));
+      settings_utils::ResolveFontList(sans_serif_font_.GetValue()));
   base::Value size_value(default_font_size_.GetValue());
   web_ui()->CallJavascriptFunctionUnsafe(
       "FontSettings.setUpSansSerifFontSample", font_value, size_value);
 }
 
 void FontSettingsHandler::SetUpFixedFontSample() {
   base::Value font_value(
-      FontSettingsUtilities::ResolveFontList(fixed_font_.GetValue()));
+      settings_utils::ResolveFontList(fixed_font_.GetValue()));
   base::Value size_value(default_fixed_font_size_.GetValue());
   web_ui()->CallJavascriptFunctionUnsafe("FontSettings.setUpFixedFontSample",
                                          font_value, size_value);
 }
 
 void FontSettingsHandler::SetUpMinimumFontSample() {
   base::Value size_value(minimum_font_size_.GetValue());
   web_ui()->CallJavascriptFunctionUnsafe("FontSettings.setUpMinimumFontSample",
                                          size_value);
 }
@@ skipping 23 matching lines @@
       chrome::FindBrowserWithWebContents(web_ui()->GetWebContents()));
 }
 
 void FontSettingsHandler::OnWebKitDefaultFontSizeChanged() {
   SetUpStandardFontSample();
   SetUpSerifFontSample();
   SetUpSansSerifFontSample();
 }
 
 }  // namespace options