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

chrome/browser/search_engines/template_url_fetcher.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 "build/build_config.h"
 
 #include "chrome/browser/search_engines/template_url_fetcher.h"
 
 #include "base/string_number_conversions.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/search_engines/template_url.h"
 #include "chrome/browser/search_engines/template_url_fetcher_callbacks.h"
 #include "chrome/browser/search_engines/template_url_service.h"
 #include "chrome/browser/search_engines/template_url_service_factory.h"
 #include "chrome/browser/search_engines/template_url_parser.h"
+#include "chrome/common/chrome_notification_types.h"
 #include "content/common/notification_observer.h"
 #include "content/common/notification_registrar.h"
 #include "content/common/notification_source.h"
-#include "content/common/notification_type.h"
 #include "content/common/url_fetcher.h"
 #include "net/url_request/url_request_status.h"
 
 // RequestDelegate ------------------------------------------------------------
 class TemplateURLFetcher::RequestDelegate : public URLFetcher::Delegate,
                                             public NotificationObserver {
  public:
   // Takes ownership of |callbacks|.
   RequestDelegate(TemplateURLFetcher* fetcher,
                   const string16& keyword,
                   const GURL& osdd_url,
                   const GURL& favicon_url,
                   TemplateURLFetcherCallbacks* callbacks,
                   ProviderType provider_type);
 
   // NotificationObserver:
-  virtual void Observe(NotificationType type,
+  virtual void Observe(int type,
                        const NotificationSource& source,
                        const NotificationDetails& details);
 
   // URLFetcher::Delegate:
   // If data contains a valid OSDD, a TemplateURL is created and added to
   // the TemplateURLService.
   virtual void OnURLFetchComplete(const URLFetcher* source,
                                   const GURL& url,
                                   const net::URLRequestStatus& status,
                                   int response_code,
@@ skipping 42 matching lines @@
       favicon_url_(favicon_url),
       provider_type_(provider_type),
       callbacks_(callbacks) {
   TemplateURLService* model = TemplateURLServiceFactory::GetForProfile(
       fetcher_->profile());
   DCHECK(model);  // TemplateURLFetcher::ScheduleDownload verifies this.
 
   if (!model->loaded()) {
     // Start the model load and set-up waiting for it.
     registrar_.Add(this,
-                   NotificationType::TEMPLATE_URL_SERVICE_LOADED,
+                   chrome::NOTIFICATION_TEMPLATE_URL_SERVICE_LOADED,
                    Source<TemplateURLService>(model));
     model->Load();
   }
 
   url_fetcher_.set_request_context(fetcher->profile()->GetRequestContext());
   url_fetcher_.Start();
 }
 
 void TemplateURLFetcher::RequestDelegate::Observe(
-    NotificationType type,
+    int type,
     const NotificationSource& source,
     const NotificationDetails& details) {
-  DCHECK(type == NotificationType::TEMPLATE_URL_SERVICE_LOADED);
+  DCHECK(type == chrome::NOTIFICATION_TEMPLATE_URL_SERVICE_LOADED);
 
   if (!template_url_.get())
     return;
   AddSearchProvider();
   // WARNING: AddSearchProvider deletes us.
 }
 
 void TemplateURLFetcher::RequestDelegate::OnURLFetchComplete(
     const URLFetcher* source,
     const GURL& url,
@@ skipping 200 matching lines @@
       new RequestDelegate(this, keyword, osdd_url, favicon_url,
                           owned_callbacks.release(), provider_type));
 }
 
 void TemplateURLFetcher::RequestCompleted(RequestDelegate* request) {
   DCHECK(find(requests_->begin(), requests_->end(), request) !=
          requests_->end());
   requests_->erase(find(requests_->begin(), requests_->end(), request));
   delete request;
 }