Convert NOTIFICATION_TEMPLATE_URL_SERVICE_LOADED to CallbackList

chrome/browser/search_engines/template_url_service_android.h

 // Copyright (c) 2013 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_SEARCH_ENGINES_TEMPLATE_URL_SERVICE_ANDROID_H_
 #define CHROME_BROWSER_SEARCH_ENGINES_TEMPLATE_URL_SERVICE_ANDROID_H_
 
 #include "base/android/jni_helper.h"
 #include "base/android/scoped_java_ref.h"
-#include "content/public/browser/notification_observer.h"
-#include "content/public/browser/notification_registrar.h"
+#include "base/memory/scoped_ptr.h"
+#include "chrome/browser/search_engines/template_url_service.h"
 
 class TemplateURL;
 class TemplateURLService;

[Lei Zhang, 2013/10/08 00:25:20]

fwd-decl no longer needed

[Cait (Slow), 2013/10/08 15:09:32]

Done.

 
 
 // Android wrapper of the TemplateUrlService which provides access from the Java
 // layer. Note that on Android, there's only a single profile, and therefore
 // a single instance of this wrapper.
-class TemplateUrlServiceAndroid : public content::NotificationObserver {
+class TemplateUrlServiceAndroid {
  public:
   TemplateUrlServiceAndroid(JNIEnv* env, jobject obj);
 
   void Load(JNIEnv* env, jobject obj);
   void SetDefaultSearchProvider(JNIEnv* env, jobject obj, jint selected_index);
   jint GetDefaultSearchProvider(JNIEnv* env, jobject obj);
   jint GetTemplateUrlCount(JNIEnv* env, jobject obj);
   jboolean IsLoaded(JNIEnv* env, jobject obj);
   base::android::ScopedJavaLocalRef<jobject>
       GetPrepopulatedTemplateUrlAt(JNIEnv* env, jobject obj, jint index);
   jboolean IsSearchProviderManaged(JNIEnv* env, jobject obj);
   jboolean IsSearchByImageAvailable(JNIEnv* env, jobject obj);
   jboolean IsDefaultSearchEngineGoogle(JNIEnv* env, jobject obj);
   base::android::ScopedJavaLocalRef<jstring> GetUrlForSearchQuery(
       JNIEnv* env,
       jobject obj,
       jstring jquery);
   base::android::ScopedJavaLocalRef<jstring> ReplaceSearchTermsInUrl(
       JNIEnv* env,
       jobject obj,
       jstring jquery,
       jstring jcurrent_url);
 
-  // NotificationObserver:
-  virtual void Observe(int type,
-                       const content::NotificationSource& source,
-                       const content::NotificationDetails& details) OVERRIDE;
-
   static bool Register(JNIEnv* env);
 
  private:
   virtual ~TemplateUrlServiceAndroid();

[Lei Zhang, 2013/10/08 00:25:20]

no longer need to be virtual

[Cait (Slow), 2013/10/08 15:09:32]

Done.

 
   bool IsPrepopulatedTemplate(TemplateURL* url);
 
+  void OnTemplateURLServiceLoaded();
+
   JavaObjectWeakGlobalRef weak_java_obj_;
-  content::NotificationRegistrar registrar_;
 
   // Pointer to the TemplateUrlService for the main profile.
   TemplateURLService* template_url_service_;
 
+  scoped_ptr<TemplateURLService::Subscription> template_url_subscription_;
+
   DISALLOW_COPY_AND_ASSIGN(TemplateUrlServiceAndroid);
 };
 
 #endif  // CHROME_BROWSER_SEARCH_ENGINES_TEMPLATE_URL_SERVICE_ANDROID_H_