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

chrome/browser/importer/importer_host.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/importer/importer_host.h"
 
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/bookmarks/bookmark_model.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/importer/firefox_profile_lock.h"
 #include "chrome/browser/importer/importer.h"
 #include "chrome/browser/importer/importer_lock_dialog.h"
 #include "chrome/browser/importer/importer_progress_observer.h"
 #include "chrome/browser/importer/importer_type.h"
 #include "chrome/browser/importer/in_process_importer_bridge.h"
 #include "chrome/browser/importer/toolbar_importer_utils.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/search_engines/template_url.h"
 #include "chrome/browser/search_engines/template_url_service.h"
 #include "chrome/browser/search_engines/template_url_service_factory.h"
 #include "chrome/browser/ui/browser_list.h"
+#include "chrome/common/chrome_notification_types.h"
 #include "content/browser/browser_thread.h"
 #include "content/common/notification_source.h"
 #include "grit/generated_resources.h"
 #include "ui/base/l10n/l10n_util.h"
 
 #if defined(OS_WIN)
 // TODO(port): Port this file.
 #include "ui/base/message_box_win.h"
 #endif
 
@@ skipping 168 matching lines @@
     installed_bookmark_observer_ = true;
   }
 
   // Observes the TemplateURLService if needed to import search engines from the
   // other browser. We also check to see if we're importing bookmarks because
   // we can import bookmark keywords from Firefox as search engines.
   if ((items & importer::SEARCH_ENGINES) || (items & importer::FAVORITES)) {
     if (!writer_->TemplateURLServiceIsLoaded()) {
       TemplateURLService* model =
           TemplateURLServiceFactory::GetForProfile(profile_);
-      registrar_.Add(this, NotificationType::TEMPLATE_URL_SERVICE_LOADED,
+      registrar_.Add(this, chrome::NOTIFICATION_TEMPLATE_URL_SERVICE_LOADED,
                      Source<TemplateURLService>(model));
       model->Load();
     }
   }
 }
 
 void ImporterHost::InvokeTaskIfDone() {
   if (waiting_for_bookmarkbar_model_ || !registrar_.IsEmpty() ||
       !is_source_readable_)
     return;
   BrowserThread::PostTask(BrowserThread::FILE, FROM_HERE, task_);
 }
 
 void ImporterHost::Loaded(BookmarkModel* model) {
   DCHECK(model->IsLoaded());
   model->RemoveObserver(this);
   waiting_for_bookmarkbar_model_ = false;
   installed_bookmark_observer_ = false;
 
   InvokeTaskIfDone();
 }
 
 void ImporterHost::BookmarkModelBeingDeleted(BookmarkModel* model) {
   installed_bookmark_observer_ = false;
 }
 
 void ImporterHost::BookmarkModelChanged() {
 }
 
-void ImporterHost::Observe(NotificationType type,
+void ImporterHost::Observe(int type,
                            const NotificationSource& source,
                            const NotificationDetails& details) {
-  DCHECK(type == NotificationType::TEMPLATE_URL_SERVICE_LOADED);
+  DCHECK(type == chrome::NOTIFICATION_TEMPLATE_URL_SERVICE_LOADED);
   registrar_.RemoveAll();
   InvokeTaskIfDone();
 }