Remove PrefObserver usages, batch 13.

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 <string>
 
 #include "base/basictypes.h"
 #include "base/bind.h"
@@ skipping 88 matching lines @@
   SetUpFixedFontSample();
   SetUpMinimumFontSample();
 }
 
 void FontSettingsHandler::RegisterMessages() {
   // Perform validation for saved fonts.
   PrefService* pref_service = Profile::FromWebUI(web_ui())->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,
-                                pref_service, this);
-  minimum_font_size_.Init(prefs::kWebKitMinimumFontSize, pref_service, this);
+  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)));
+  sans_serif_font_.Init(
+      prefs::kWebKitSansSerifFontFamily,
+      pref_service,
+      base::Bind(&FontSettingsHandler::SetUpSansSerifFontSample,
+                 base::Unretained(this)));
+  fixed_font_.Init(prefs::kWebKitFixedFontFamily,
+                   pref_service,
+                   base::Bind(&FontSettingsHandler::SetUpFixedFontSample,

[Jói, 2012/11/21 13:37:45]

I would group the initialization of fixed_font_ and default_fixed_font_size_ and
provide them both the same callback object.

[tfarina, 2012/11/21 13:48:33]

Done.

+                              base::Unretained(this)));
+  font_encoding_.Init(prefs::kDefaultCharset,
+                      pref_service,
+                      base::Bind(&base::DoNothing));

[Mattias Nissler (ping if slow), 2012/11/21 13:29:26]

If we really don't want a change notification callback (which I doubt), you can
drop the 3rd parameter here. Let's ask an OWNER of this file.

[tfarina, 2012/11/21 13:36:24]

That was my first attempt.

But dropping it causes:
../../chrome/browser/api/prefs/pref_member.h:177:50: error: too few arguments to
function call, expected 3, have 2
    subtle::PrefMemberBase::Init(pref_name, prefs);
    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~                 ^
../../chrome/browser/ui/webui/options/font_settings_handler.cc:122:15: note: in
instantiation of member function 'PrefMember<std::basic_string<char> >::Init'
requested here
  fixed_font_.Init(prefs::kWebKitFixedFontFamily,
              ^
../../chrome/browser/api/prefs/pref_member.h:103:3: note: 'Init' declared here
  void Init(const char* pref_name, PrefServiceBase* prefs,
  ^

[Jói, 2012/11/21 13:37:45]

Agreed we should ask an OWNER.

[Jói, 2012/11/21 13:52:39]

For now, you can pass a NULL as the 3rd argument.  I will clean it up when I
remove the ability to pass a PrefObserver* to PrefMember::Init (and at that
point will remove all NULL 3rd arguments in favor of a 2-argument version).

[falken, 2012/11/21 14:21:45]

Right, there's nothing to do when the encoding changes. The sample text is all
Latin anyway ("Lorem ipsum...") and no style change is needed (unlike when the
font family or size changes).

For the record, though, I'm not an OWNER.

+  default_font_size_.Init(
+      prefs::kWebKitDefaultFontSize,
+      pref_service,
+      base::Bind(&FontSettingsHandler::OnWebKitDefaultFontSizeChanged,
+                 base::Unretained(this)));
+  default_fixed_font_size_.Init(
+      prefs::kWebKitDefaultFixedFontSize,
+      pref_service,
+      base::Bind(&FontSettingsHandler::SetUpFixedFontSample,
+                 base::Unretained(this)));
+  minimum_font_size_.Init(
+      prefs::kWebKitMinimumFontSize,
+      pref_service,
+      base::Bind(&FontSettingsHandler::SetUpMinimumFontSample,
+                 base::Unretained(this)));
 
   web_ui()->RegisterMessageCallback("fetchFontsData",
       base::Bind(&FontSettingsHandler::HandleFetchFontsData,
                  base::Unretained(this)));
 }
 
 void FontSettingsHandler::HandleFetchFontsData(const ListValue* args) {
   content::GetFontListAsync(
       base::Bind(&FontSettingsHandler::FontsListHasLoaded,
                  base::Unretained(this)));
@@ skipping 52 matching lines @@
       sans_serif_font_.GetValue())));
   selected_values.Append(Value::CreateStringValue(MaybeGetLocalizedFontName(
       fixed_font_.GetValue())));
   selected_values.Append(Value::CreateStringValue(font_encoding_.GetValue()));
 
   web_ui()->CallJavascriptFunction("FontSettings.setFontsData",
                                    *list.get(), encoding_list,
                                    selected_values);
 }
 
-void FontSettingsHandler::OnPreferenceChanged(PrefServiceBase* service,
-                                              const std::string& pref_name) {
-  if (pref_name == prefs::kWebKitStandardFontFamily) {
-    SetUpStandardFontSample();
-  } else if (pref_name == prefs::kWebKitSerifFontFamily) {
-    SetUpSerifFontSample();
-  } else if (pref_name == prefs::kWebKitSansSerifFontFamily) {
-    SetUpSansSerifFontSample();
-  } else if (pref_name == prefs::kWebKitFixedFontFamily ||
-             pref_name == prefs::kWebKitDefaultFixedFontSize) {
-    SetUpFixedFontSample();
-  } else if (pref_name == prefs::kWebKitDefaultFontSize) {
-    SetUpStandardFontSample();
-    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());
   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());
@@ skipping 14 matching lines @@
   web_ui()->CallJavascriptFunction(
       "FontSettings.setUpFixedFontSample", font_value, size_value);
 }
 
 void FontSettingsHandler::SetUpMinimumFontSample() {
   base::FundamentalValue size_value(minimum_font_size_.GetValue());
   web_ui()->CallJavascriptFunction("FontSettings.setUpMinimumFontSample",
                                    size_value);
 }
 
+void FontSettingsHandler::OnWebKitDefaultFontSizeChanged() {
+    SetUpStandardFontSample();
+    SetUpSerifFontSample();
+    SetUpSansSerifFontSample();
+}
+
 }  // namespace options