Convert NOTIFICATION_TEMPLATE_URL_SERVICE_LOADED to CallbackList

chrome/browser/search_engines/template_url_service.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/search_engines/template_url_service.h"
 
 #include <algorithm>
 #include <utility>
 
 #include "base/auto_reset.h"
@@ skipping 764 matching lines @@
   }
 
   if (service_.get()) {
     load_handle_ = service_->GetKeywords(this);
   } else {
     ChangeToLoadedState();
     NotifyLoaded();
   }
 }
 
+scoped_ptr<TemplateURLService::Subscription>
+TemplateURLService::RegisterOnLoadedCallback(

[Peter Kasting, 2013/10/02 22:22:04]

Nit: Indent 4

[Cait (Slow), 2013/10/03 15:36:45]

Done.

+    const base::Closure& callback) {
+  if (loaded_)

[Peter Kasting, 2013/10/02 22:22:04]

Nit: I very slightly prefer:

  return loaded_ ?
      scoped_ptr<TemplateURLService::Subscription>() :
      on_loaded_callbacks_.Add(callback);

[Cait (Slow), 2013/10/03 15:36:45]

Done.

+    return scoped_ptr<TemplateURLService::Subscription>();
+  return on_loaded_callbacks_.Add(callback);
+}
+
 void TemplateURLService::OnWebDataServiceRequestDone(
     WebDataService::Handle h,
     const WDTypedResult* result) {
   // Reset the load_handle so that we don't try and cancel the load in
   // the destructor.
   load_handle_ = 0;
 
   if (!result) {
     // Results are null if the database went away or (most likely) wasn't
     // loaded.
@@ skipping 775 matching lines @@
 
 void TemplateURLService::ChangeToLoadedState() {
   DCHECK(!loaded_);
 
   UIThreadSearchTermsData search_terms_data(profile_);
   provider_map_->Init(template_urls_, search_terms_data);
   loaded_ = true;
 }
 
 void TemplateURLService::NotifyLoaded() {
-  content::NotificationService::current()->Notify(
-      chrome::NOTIFICATION_TEMPLATE_URL_SERVICE_LOADED,
-      content::Source<TemplateURLService>(this),
-      content::NotificationService::NoDetails());
+  on_loaded_callbacks_.Notify();

[Peter Kasting, 2013/10/02 22:22:04]

Nit: At this point, we can just nuke NotifyLoaded() and inline this line into
the callers directly.

[Cait (Slow), 2013/10/03 15:36:45]

Done.

 }
 
 void TemplateURLService::SaveDefaultSearchProviderToPrefs(
     const TemplateURL* t_url) {
   PrefService* prefs = GetPrefs();
   if (!prefs)
     return;
 
   bool enabled = false;
   std::string search_url;
@@ skipping 1044 matching lines @@
     const ExtensionKeyword& extension_keyword) const {
   TemplateURLData data;
   data.short_name = UTF8ToUTF16(extension_keyword.extension_name);
   data.SetKeyword(UTF8ToUTF16(extension_keyword.extension_keyword));
   // This URL is not actually used for navigation. It holds the extension's
   // ID, as well as forcing the TemplateURL to be treated as a search keyword.
   data.SetURL(std::string(extensions::kExtensionScheme) + "://" +
       extension_keyword.extension_id + "/?q={searchTerms}");
   return new TemplateURL(profile_, data);
 }