Moving notification types which are chrome specific to a new header file chrome_notification_type...

chrome/browser/search_engines/template_url_service.cc

 // Copyright (c) 2011 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 "base/command_line.h"
 #include "base/environment.h"
 #include "base/i18n/case_conversion.h"
 #include "base/stl_util-inl.h"
@@ skipping 10 matching lines @@
 #include "chrome/browser/prefs/pref_service.h"
 #include "chrome/browser/prefs/pref_set_observer.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/rlz/rlz.h"
 #include "chrome/browser/search_engines/search_host_to_urls_map.h"
 #include "chrome/browser/search_engines/search_terms_data.h"
 #include "chrome/browser/search_engines/template_url.h"
 #include "chrome/browser/search_engines/template_url_service_observer.h"
 #include "chrome/browser/search_engines/template_url_prepopulate_data.h"
 #include "chrome/browser/search_engines/util.h"
+#include "chrome/common/chrome_notification_types.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/env_vars.h"
 #include "chrome/common/extensions/extension.h"
 #include "chrome/common/pref_names.h"
 #include "chrome/common/url_constants.h"
 #include "content/common/notification_service.h"
 #include "net/base/net_util.h"
 #include "ui/base/l10n/l10n_util.h"
 
 using base::Time;
@@ skipping 531 matching lines @@
   // TODO(sky): Once LocationBarView adds a listener to the TemplateURLService
   // to track changes to the model, this should become a DCHECK.
   if (template_url) {
     *is_extension_keyword = template_url->IsExtensionKeyword();
     return template_url->AdjustedShortNameForLocaleDirection();
   }
   *is_extension_keyword = false;
   return string16();
 }
 
-void TemplateURLService::Observe(NotificationType type,
+void TemplateURLService::Observe(int type,
                                  const NotificationSource& source,
                                  const NotificationDetails& details) {
-  if (type == NotificationType::HISTORY_URL_VISITED) {
+  if (type == chrome::NOTIFICATION_HISTORY_URL_VISITED) {
     Details<history::URLVisitedDetails> visit_details(details);
     if (!loaded())
       visits_to_add_.push_back(*visit_details.ptr());
     else
       UpdateKeywordSearchTermsForURL(*visit_details.ptr());
-  } else if (type == NotificationType::GOOGLE_URL_UPDATED) {
+  } else if (type == chrome::NOTIFICATION_GOOGLE_URL_UPDATED) {
     if (loaded_)
       GoogleBaseURLChanged();
-  } else if (type == NotificationType::PREF_CHANGED) {
+  } else if (type == chrome::NOTIFICATION_PREF_CHANGED) {
     const std::string* pref_name = Details<std::string>(details).ptr();
     if (!pref_name || default_search_prefs_->IsObserved(*pref_name)) {
       // A preference related to default search engine has changed.
       // Update the model if needed.
       UpdateDefaultSearch();
     }
   } else {
     NOTREACHED();
   }
 }
@@ skipping 43 matching lines @@
 }
 
 void TemplateURLService::Init(const Initializer* initializers,
                             int num_initializers) {
   // Register for notifications.
   if (profile_) {
     // TODO(sky): bug 1166191. The keywords should be moved into the history
     // db, which will mean we no longer need this notification and the history
     // backend can handle automatically adding the search terms as the user
     // navigates.
-    registrar_.Add(this, NotificationType::HISTORY_URL_VISITED,
+    registrar_.Add(this, chrome::NOTIFICATION_HISTORY_URL_VISITED,
                    Source<Profile>(profile_->GetOriginalProfile()));
     PrefService* prefs = GetPrefs();
     default_search_prefs_.reset(
         PrefSetObserver::CreateDefaultSearchPrefSetObserver(prefs, this));
   }
-  registrar_.Add(this, NotificationType::GOOGLE_URL_UPDATED,
+  registrar_.Add(this, chrome::NOTIFICATION_GOOGLE_URL_UPDATED,
                  NotificationService::AllSources());
 
   if (num_initializers > 0) {
     // This path is only hit by test code and is used to simulate a loaded
     // TemplateURLService.
     ChangeToLoadedState();
 
     // Add specific initializers, if any.
     for (int i(0); i < num_initializers; ++i) {
       DCHECK(initializers[i].keyword);
@@ skipping 93 matching lines @@
 void TemplateURLService::ChangeToLoadedState() {
   DCHECK(!loaded_);
 
   UIThreadSearchTermsData search_terms_data;
   provider_map_.Init(template_urls_, search_terms_data);
   loaded_ = true;
 }
 
 void TemplateURLService::NotifyLoaded() {
   NotificationService::current()->Notify(
-      NotificationType::TEMPLATE_URL_SERVICE_LOADED,
+      chrome::NOTIFICATION_TEMPLATE_URL_SERVICE_LOADED,
       Source<TemplateURLService>(this),
       NotificationService::NoDetails());
 
   for (size_t i = 0; i < pending_extension_ids_.size(); ++i) {
     const Extension* extension = profile_->GetExtensionService()->
         GetExtensionById(pending_extension_ids_[i], true);
     if (extension)
       RegisterExtensionKeyword(extension);
   }
   pending_extension_ids_.clear();
@@ skipping 470 matching lines @@
   // Remove it from the vector containing all TemplateURLs.
   template_urls_.erase(i);
 
   if (service_.get())
     service_->RemoveKeyword(*template_url);
 
   if (profile_) {
     Source<Profile> source(profile_);
     TemplateURLID id = template_url->id();
     NotificationService::current()->Notify(
-        NotificationType::TEMPLATE_URL_REMOVED,
+        chrome::NOTIFICATION_TEMPLATE_URL_REMOVED,
         source,
         Details<TemplateURLID>(&id));
   }
 
   // We own the TemplateURL and need to delete it.
   delete template_url;
 }
 
 void TemplateURLService::NotifyObservers() {
   if (!loaded_)
@@ skipping 42 matching lines @@
 
       i = template_urls->erase(i);
       if (service_.get())
         service_->RemoveKeyword(*template_url);
       delete template_url;
     } else {
       ++i;
     }
   }
 }