Remove content::NotificationObserver dependency from most Prefs code.

chrome/browser/translate/translate_manager.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.
 
 #ifndef CHROME_BROWSER_TRANSLATE_TRANSLATE_MANAGER_H_
 #define CHROME_BROWSER_TRANSLATE_TRANSLATE_MANAGER_H_
 
 #include <map>
 #include <set>
 #include <string>
 #include <vector>
 
 #include "base/gtest_prod_util.h"
 #include "base/lazy_instance.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/memory/weak_ptr.h"
 #include "base/prefs/public/pref_change_registrar.h"
+#include "base/prefs/public/pref_observer.h"
 #include "base/time.h"
 #include "chrome/common/translate_errors.h"
 #include "content/public/browser/notification_observer.h"
 #include "content/public/browser/notification_registrar.h"
 #include "net/url_request/url_fetcher_delegate.h"
 
 template <typename T> struct DefaultSingletonTraits;
 class GURL;
 struct PageTranslatedDetails;
 class PrefService;
+class PrefServiceBase;
 class TranslateInfoBarDelegate;
 
 namespace content {
 class WebContents;
 }
 
 namespace net {
 class URLFetcher;
 }
 
 // The TranslateManager class is responsible for showing an info-bar when a page
 // in a language different than the user language is loaded.  It triggers the
 // page translation the user requests.
 // It is a singleton.
 
 class TranslateManager : public content::NotificationObserver,
+                         public PrefObserver,
                          public net::URLFetcherDelegate {
  public:
   // Returns the singleton instance.
   static TranslateManager* GetInstance();
 
   virtual ~TranslateManager();
 
   // Let the caller decide if and when we should fetch the language list from
   // the translate server. This is a NOOP if switches::kDisableTranslate is
   // set or if prefs::kEnableTranslate is set to false.
@@ skipping 21 matching lines @@
   void ReportLanguageDetectionError(content::WebContents* web_contents);
 
   // Clears the translate script, so it will be fetched next time we translate.
   void ClearTranslateScript() { translate_script_.clear(); }
 
   // content::NotificationObserver implementation:
   virtual void Observe(int type,
                        const content::NotificationSource& source,
                        const content::NotificationDetails& details) OVERRIDE;
 
+  // PrefObserver implementation:
+  virtual void OnPreferenceChanged(PrefServiceBase* service,
+                                   const std::string& pref_name) OVERRIDE;
+
   // net::URLFetcherDelegate implementation:
   virtual void OnURLFetchComplete(const net::URLFetcher* source) OVERRIDE;
 
   // Used by unit-tests to override the default delay after which the translate
   // script is fetched again from the translation server.
   void set_translate_script_expiration_delay(int delay_ms) {
     translate_script_expiration_delay_ =
         base::TimeDelta::FromMilliseconds(delay_ms);
   }
 
@@ skipping 65 matching lines @@
   void PageTranslated(content::WebContents* web_contents,
                       PageTranslatedDetails* details);
 
   // Returns true if the passed language has been configured by the user as an
   // accept language.
   bool IsAcceptLanguage(content::WebContents* web_contents,
                         const std::string& language);
 
   // Initializes the |accept_languages_| language table based on the associated
   // preference in |prefs|.
-  void InitAcceptLanguages(PrefService* prefs);
+  void InitAcceptLanguages(PrefServiceBase* prefs);
 
   // Fetches the JS translate script (the script that is injected in the page
   // to translate it).
   void RequestTranslateScript();
 
   // Shows the specified translate |infobar| in the given |tab|.  If a current
   // translate infobar is showing, it just replaces it with the new one.
   void ShowInfoBar(content::WebContents* web_contents,
                    TranslateInfoBarDelegate* infobar);
 
@@ skipping 11 matching lines @@
 
   content::NotificationRegistrar notification_registrar_;
 
   // Each PrefChangeRegistrar only tracks a single PrefService, so a map from
   // each PrefService used to its registrar is needed.
   typedef std::map<PrefService*, PrefChangeRegistrar*> PrefServiceRegistrarMap;
   PrefServiceRegistrarMap pref_change_registrars_;
 
   // A map that associates a profile with its parsed "accept languages".
   typedef std::set<std::string> LanguageSet;
-  typedef std::map<PrefService*, LanguageSet> PrefServiceLanguagesMap;
+  typedef std::map<PrefServiceBase*, LanguageSet> PrefServiceLanguagesMap;
   PrefServiceLanguagesMap accept_languages_;
 
   base::WeakPtrFactory<TranslateManager> weak_method_factory_;
 
   // The JS injected in the page to do the translation.
   std::string translate_script_;
 
   // Delay after which the translate script is fetched again
   // from the translate server.
   base::TimeDelta translate_script_expiration_delay_;
@@ skipping 10 matching lines @@
   // server.
   std::vector<PendingRequest> pending_requests_;
 
   // The languages supported by the translation server.
   static base::LazyInstance<std::set<std::string> > supported_languages_;
 
   DISALLOW_COPY_AND_ASSIGN(TranslateManager);
 };
 
 #endif  // CHROME_BROWSER_TRANSLATE_TRANSLATE_MANAGER_H_