Removing PrefObserver usage, batch 4.

chrome/browser/extensions/api/font_settings/font_settings_api.h

 // 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.
 
 // Defines the classes to realize the Font Settings Extension API as specified
 // in the extension API JSON.
 
 #ifndef CHROME_BROWSER_EXTENSIONS_API_FONT_SETTINGS_FONT_SETTINGS_API_H__
 #define CHROME_BROWSER_EXTENSIONS_API_FONT_SETTINGS_FONT_SETTINGS_API_H__
 
 #include <map>
 #include <string>
 #include <utility>

[falken, 2012/11/14 14:09:24]

Can we get rid of <map> and <utility> now?

[Jói, 2012/11/14 14:40:21]

Done.

 
 #include "base/prefs/public/pref_change_registrar.h"
-#include "base/prefs/public/pref_observer.h"
 #include "chrome/browser/extensions/extension_function.h"
 #include "chrome/browser/prefs/pref_service.h"
 
 namespace extensions {
 
 // This class observes pref changed events on a profile and dispatches the
 // corresponding extension API events to extensions.
-class FontSettingsEventRouter : public PrefObserver {
+class FontSettingsEventRouter {
  public:
   // Constructor for observing pref changed events on |profile|. Stores a
   // pointer to |profile| but does not take ownership. |profile| must be
   // non-NULL and remain alive for the lifetime of the instance.
   explicit FontSettingsEventRouter(Profile* profile);
   virtual ~FontSettingsEventRouter();
 
  private:
-  typedef std::pair<std::string, std::string> EventAndKeyPair;
-  // Map of pref name to a pair of event name and key (defined in the extension
-  // API) for dispatching a pref changed event. For example,
-  // "webkit.webprefs.default_font_size" to ("onDefaultFontSizedChanged",
-  // "pixelSize").
-  typedef std::map<std::string, EventAndKeyPair> PrefEventMap;
-
   // Observes browser pref |pref_name|. When a change is observed, dispatches
   // event |event_name| to extensions. A JavaScript object is passed to the
   // extension event function with the new value of the pref in property |key|.
   void AddPrefToObserve(const char* pref_name,
                         const char* event_name,
                         const char* key);
 
-  // PrefObserver implementation.
-  virtual void OnPreferenceChanged(PrefServiceBase* service,
-                                   const std::string& pref_name) OVERRIDE;
+  // Decodes a preference change for a font family map and invokes
+  // OnFontNamePrefChange with the right parameters.
+  void OnFontFamilyPrefChanged(const std::string& pref_name);

[falken, 2012/11/14 14:09:24]

How about "OnFontFamilyMapPrefChanged"?

It's a bit confusing to have the functions named OnFontFamilyPrefChanged vs.
OnFontNamePrefChanged. There is not really a difference between a font family
and a font name (it's probably my fault for not being consistent).

[Jói, 2012/11/14 14:40:21]

Done.

 
   // Dispatches a changed event for the font setting for |generic_family| and
   // |script| to extensions. The new value of the setting is the value of
-  // browser pref |pref_name|. If the pref changed on the incognito profile,
-  // |incognito| must be set to true for extensions to get the appropriate
-  // event.
-  void OnFontNamePrefChanged(PrefServiceBase* pref_service,
-                             const std::string& pref_name,
+  // browser pref |pref_name|.
+  void OnFontNamePrefChanged(const std::string& pref_name,
                              const std::string& generic_family,
-                             const std::string& script,
-                             bool incognito);
+                             const std::string& script);
 
   // Dispatches the setting changed event |event_name| to extensions. The new
   // value of the setting is the value of browser pref |pref_name|. This value
   // is passed in the JavaScript object argument to the extension event function
-  // under the key |key|. If the pref changed on the incognito profile,
-  // |incognito| must be set to true for extensions to get the appropriate
-  // event.
-  void OnFontPrefChanged(PrefServiceBase* pref_service,
-                         const std::string& pref_name,
-                         const std::string& event_name,
+  // under the key |key|.
+  void OnFontPrefChanged(const std::string& event_name,
                          const std::string& key,
-                         bool incognito);
+                         const std::string& pref_name);
 
   // Manages pref observation registration.
   PrefChangeRegistrar registrar_;
 
-  // Maps browser pref names to extension API <event name, key> pairs.
-  PrefEventMap pref_event_map_;
-
   // Weak, owns us (transitively via ExtensionService).
   Profile* profile_;
 
   DISALLOW_COPY_AND_ASSIGN(FontSettingsEventRouter);
 };
 
 // fontSettings.clearFont API function.
 class ClearFontFunction : public SyncExtensionFunction {
  public:
   DECLARE_EXTENSION_FUNCTION_NAME("fontSettings.clearFont")
@@ skipping 199 matching lines @@
   virtual ~SetMinimumFontSizeFunction() {}
 
   // SetFontPrefExtensionFunction:
   virtual const char* GetPrefName() OVERRIDE;
   virtual const char* GetKey() OVERRIDE;
 };
 
 }  // namespace extensions
 
 #endif  // CHROME_BROWSER_EXTENSIONS_API_FONT_SETTINGS_FONT_SETTINGS_API_H__