summaryrefslogtreecommitdiffstats
path: root/chrome/browser/importer
diff options
context:
space:
mode:
Diffstat (limited to 'chrome/browser/importer')
-rw-r--r--chrome/browser/importer/importer_host.cc7
-rw-r--r--chrome/browser/importer/importer_host.h2
-rw-r--r--chrome/browser/importer/profile_writer.cc3
3 files changed, 7 insertions, 5 deletions
diff --git a/chrome/browser/importer/importer_host.cc b/chrome/browser/importer/importer_host.cc
index 101fc7b..d4b66cc 100644
--- a/chrome/browser/importer/importer_host.cc
+++ b/chrome/browser/importer/importer_host.cc
@@ -19,6 +19,7 @@
#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"
@@ -207,7 +208,7 @@ void ImporterHost::CheckForLoadedModels(uint16 items) {
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();
}
@@ -237,10 +238,10 @@ void ImporterHost::BookmarkModelBeingDeleted(BookmarkModel* model) {
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();
}
diff --git a/chrome/browser/importer/importer_host.h b/chrome/browser/importer/importer_host.h
index d3426cf..5e0e933 100644
--- a/chrome/browser/importer/importer_host.h
+++ b/chrome/browser/importer/importer_host.h
@@ -141,7 +141,7 @@ class ImporterHost : public base::RefCountedThreadSafe<ImporterHost>,
// NotificationObserver:
// Called when TemplateURLService has been loaded.
- virtual void Observe(NotificationType type,
+ virtual void Observe(int type,
const NotificationSource& source,
const NotificationDetails& details) OVERRIDE;
diff --git a/chrome/browser/importer/profile_writer.cc b/chrome/browser/importer/profile_writer.cc
index 9b6b085..32d915b 100644
--- a/chrome/browser/importer/profile_writer.cc
+++ b/chrome/browser/importer/profile_writer.cc
@@ -17,6 +17,7 @@
#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/common/chrome_notification_types.h"
#include "chrome/common/pref_names.h"
#include "content/common/notification_service.h"
@@ -61,7 +62,7 @@ void ShowBookmarkBar(Profile* profile) {
prefs->ScheduleSavePersistentPrefs();
Source<Profile> source(profile);
NotificationService::current()->Notify(
- NotificationType::BOOKMARK_BAR_VISIBILITY_PREF_CHANGED, source,
+ chrome::NOTIFICATION_BOOKMARK_BAR_VISIBILITY_PREF_CHANGED, source,
NotificationService::NoDetails());
}
}