Support getting the font list in Pepper. This currently only works out of

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"
 #include "base/i18n/rtl.h"
 #include "base/string_number_conversions.h"
 #include "base/string_util.h"
 #include "base/values.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/character_encoding.h"
 #include "chrome/browser/prefs/pref_service.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ui/webui/options/font_settings_utils.h"
 #include "chrome/common/pref_names.h"
 #include "content/common/notification_details.h"
 #include "content/common/notification_type.h"
 #include "grit/chromium_strings.h"
 #include "grit/generated_resources.h"
 #include "ui/base/l10n/l10n_util.h"
 
 FontSettingsHandler::FontSettingsHandler() {
-  fonts_list_loader_ = new FontSettingsFontsListLoader(this);
 }
 
 FontSettingsHandler::~FontSettingsHandler() {
-  if (fonts_list_loader_)
-    fonts_list_loader_->SetObserver(NULL);
 }
 
 void FontSettingsHandler::GetLocalizedValues(
     DictionaryValue* localized_strings) {
   DCHECK(localized_strings);
 
   static OptionsStringResource resources[] = {
     { "fontSettingsStandard",
       IDS_FONT_LANGUAGE_SETTING_FONT_SELECTOR_STANDARD_LABEL },
     { "fontSettingsSerif",
@@ skipping 54 matching lines @@
   // Return result from the superclass.
   return handler;
 }
 
 void FontSettingsHandler::RegisterMessages() {
   web_ui_->RegisterMessageCallback("fetchFontsData",
       NewCallback(this, &FontSettingsHandler::HandleFetchFontsData));
 }
 
 void FontSettingsHandler::HandleFetchFontsData(const ListValue* args) {
-  fonts_list_loader_->StartLoadFontsList();
+  content::GetFontListAsync(
+      base::Bind(&FontSettingsHandler::FontsListHasLoaded, AsWeakPtr()));
 }
 
-void FontSettingsHandler::FontsListHasLoaded() {
-  ListValue* fonts_list = fonts_list_loader_->GetFontsList();
-
+void FontSettingsHandler::FontsListHasLoaded(
+    scoped_refptr<content::FontListResult> list) {
   ListValue encoding_list;
   const std::vector<CharacterEncoding::EncodingInfo>* encodings;
   PrefService* pref_service = web_ui_->GetProfile()->GetPrefs();
   encodings = CharacterEncoding::GetCurrentDisplayEncodings(
       g_browser_process->GetApplicationLocale(),
       pref_service->GetString(prefs::kStaticEncodings),
       pref_service->GetString(prefs::kRecentlySelectedEncoding));
   DCHECK(encodings);
   DCHECK(!encodings->empty());
 
@@ skipping 17 matching lines @@
   }
 
   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()));
 
   web_ui_->CallJavascriptFunction("FontSettings.setFontsData",
-                                  *fonts_list, encoding_list, selected_values);
+                                  *list->list.get(), encoding_list,
+                                  selected_values);
 }
 
 void FontSettingsHandler::Observe(NotificationType type,
                                   const NotificationSource& source,
                                   const NotificationDetails& details) {
   if (type == NotificationType::PREF_CHANGED) {
     std::string* pref_name = Details<std::string>(details).ptr();
     if (*pref_name == prefs::kWebKitStandardFontFamily) {
       SetUpStandardFontSample();
     } else if (*pref_name == prefs::kWebKitSerifFontFamily) {
@@ skipping 39 matching lines @@
   FundamentalValue size_value(default_fixed_font_size_.GetValue());
   web_ui_->CallJavascriptFunction(
       "FontSettings.setUpFixedFontSample", font_value, size_value);
 }
 
 void FontSettingsHandler::SetUpMinimumFontSample() {
   FundamentalValue size_value(minimum_font_size_.GetValue());
   web_ui_->CallJavascriptFunction("FontSettings.setUpMinimumFontSample",
                                   size_value);
 }