Removal of Profile from content part 6.

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/chrome_notification_types.h"
 #include "chrome/common/pref_names.h"
+#include "content/browser/tab_contents/tab_contents.h"
 #include "content/common/notification_details.h"
 #include "grit/chromium_strings.h"
 #include "grit/generated_resources.h"
 #include "ui/base/l10n/l10n_util.h"
 
 FontSettingsHandler::FontSettingsHandler() {
 }
 
 FontSettingsHandler::~FontSettingsHandler() {
 }
@@ skipping 39 matching lines @@
   SetUpFixedFontSample();
   SetUpMinimumFontSample();
 }
 
 WebUIMessageHandler* FontSettingsHandler::Attach(WebUI* web_ui) {
   // Call through to superclass.
   WebUIMessageHandler* handler = OptionsPageUIHandler::Attach(web_ui);
 
   // Perform validation for saved fonts.
   DCHECK(web_ui_);
-  PrefService* pref_service = web_ui_->GetProfile()->GetPrefs();
+  Profile* profile =
+      Profile::FromBrowserContext(web_ui_->tab_contents()->browser_context());
+  PrefService* pref_service = profile->GetPrefs();
   FontSettingsUtilities::ValidateSavedFonts(pref_service);
 
   // Register for preferences that we need to observe manually.
   standard_font_.Init(prefs::kWebKitStandardFontFamily, pref_service, this);
   serif_font_.Init(prefs::kWebKitSerifFontFamily, pref_service, this);
   sans_serif_font_.Init(prefs::kWebKitSansSerifFontFamily, pref_service, this);
   fixed_font_.Init(prefs::kWebKitFixedFontFamily, pref_service, this);
   font_encoding_.Init(prefs::kDefaultCharset, pref_service, this);
   default_font_size_.Init(prefs::kWebKitDefaultFontSize, pref_service, this);
   default_fixed_font_size_.Init(prefs::kWebKitDefaultFixedFontSize,
@@ skipping 11 matching lines @@
 
 void FontSettingsHandler::HandleFetchFontsData(const ListValue* args) {
   content::GetFontListAsync(
       base::Bind(&FontSettingsHandler::FontsListHasLoaded, AsWeakPtr()));
 }
 
 void FontSettingsHandler::FontsListHasLoaded(
     scoped_refptr<content::FontListResult> list) {
   ListValue encoding_list;
   const std::vector<CharacterEncoding::EncodingInfo>* encodings;
-  PrefService* pref_service = web_ui_->GetProfile()->GetPrefs();
+  Profile* profile =
+      Profile::FromBrowserContext(web_ui_->tab_contents()->browser_context());
+  PrefService* pref_service = profile->GetPrefs();
   encodings = CharacterEncoding::GetCurrentDisplayEncodings(
       g_browser_process->GetApplicationLocale(),
       pref_service->GetString(prefs::kStaticEncodings),
       pref_service->GetString(prefs::kRecentlySelectedEncoding));
   DCHECK(encodings);
   DCHECK(!encodings->empty());
 
   std::vector<CharacterEncoding::EncodingInfo>::const_iterator it;
   for (it = encodings->begin(); it != encodings->end(); ++it) {
     ListValue* option = new ListValue();
@@ skipping 75 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);
 }