| Index: chrome/browser/search_engines/search_provider_install_data.cc
|
| ===================================================================
|
| --- chrome/browser/search_engines/search_provider_install_data.cc (revision 91968)
|
| +++ chrome/browser/search_engines/search_provider_install_data.cc (working copy)
|
| @@ -16,12 +16,12 @@
|
| #include "chrome/browser/search_engines/template_url_service.h"
|
| #include "chrome/browser/search_engines/util.h"
|
| #include "chrome/browser/webdata/web_data_service.h"
|
| +#include "chrome/common/chrome_notification_types.h"
|
| #include "content/browser/browser_thread.h"
|
| #include "content/common/notification_observer.h"
|
| #include "content/common/notification_registrar.h"
|
| #include "content/common/notification_service.h"
|
| #include "content/common/notification_source.h"
|
| -#include "content/common/notification_type.h"
|
|
|
| typedef SearchHostToURLsMap::TemplateURLSet TemplateURLSet;
|
|
|
| @@ -103,11 +103,11 @@
|
| public:
|
| GoogleURLObserver(
|
| GoogleURLChangeNotifier* change_notifier,
|
| - NotificationType ui_death_notification,
|
| + int ui_death_notification,
|
| const NotificationSource& ui_death_source);
|
|
|
| // Implementation of NotificationObserver.
|
| - virtual void Observe(NotificationType type,
|
| + virtual void Observe(int type,
|
| const NotificationSource& source,
|
| const NotificationDetails& details);
|
|
|
| @@ -122,19 +122,19 @@
|
|
|
| GoogleURLObserver::GoogleURLObserver(
|
| GoogleURLChangeNotifier* change_notifier,
|
| - NotificationType ui_death_notification,
|
| + int ui_death_notification,
|
| const NotificationSource& ui_death_source)
|
| : change_notifier_(change_notifier) {
|
| DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
|
| - registrar_.Add(this, NotificationType::GOOGLE_URL_UPDATED,
|
| + registrar_.Add(this, chrome::NOTIFICATION_GOOGLE_URL_UPDATED,
|
| NotificationService::AllSources());
|
| registrar_.Add(this, ui_death_notification, ui_death_source);
|
| }
|
|
|
| -void GoogleURLObserver::Observe(NotificationType type,
|
| +void GoogleURLObserver::Observe(int type,
|
| const NotificationSource& source,
|
| const NotificationDetails& details) {
|
| - if (type == NotificationType::GOOGLE_URL_UPDATED) {
|
| + if (type == chrome::NOTIFICATION_GOOGLE_URL_UPDATED) {
|
| BrowserThread::PostTask(BrowserThread::IO, FROM_HERE,
|
| NewRunnableMethod(change_notifier_.get(),
|
| &GoogleURLChangeNotifier::OnChange,
|
| @@ -162,7 +162,7 @@
|
|
|
| SearchProviderInstallData::SearchProviderInstallData(
|
| WebDataService* web_service,
|
| - NotificationType ui_death_notification,
|
| + int ui_death_notification,
|
| const NotificationSource& ui_death_source)
|
| : web_service_(web_service),
|
| load_handle_(0),
|
|
|