Index: chrome/browser/notifications/notification_ui_manager.cc |
=================================================================== |
--- chrome/browser/notifications/notification_ui_manager.cc (revision 91968) |
+++ chrome/browser/notifications/notification_ui_manager.cc (working copy) |
@@ -13,10 +13,10 @@ |
#include "chrome/browser/notifications/balloon_collection.h" |
#include "chrome/browser/notifications/notification.h" |
#include "chrome/browser/prefs/pref_service.h" |
+#include "chrome/common/chrome_notification_types.h" |
#include "chrome/common/pref_names.h" |
#include "content/browser/site_instance.h" |
#include "content/common/notification_service.h" |
-#include "content/common/notification_type.h" |
namespace { |
const int kUserStatePollingIntervalSeconds = 1; |
@@ -50,7 +50,7 @@ |
NotificationUIManager::NotificationUIManager(PrefService* local_state) |
: balloon_collection_(NULL), |
is_user_active_(true) { |
- registrar_.Add(this, NotificationType::APP_TERMINATING, |
+ registrar_.Add(this, content::NOTIFICATION_APP_TERMINATING, |
NotificationService::AllSources()); |
position_pref_.Init(prefs::kDesktopNotificationPosition, local_state, this); |
#if defined(OS_MACOSX) |
@@ -232,12 +232,12 @@ |
balloon_collection_->SetPositionPreference(preference); |
} |
-void NotificationUIManager::Observe(NotificationType type, |
+void NotificationUIManager::Observe(int type, |
const NotificationSource& source, |
const NotificationDetails& details) { |
- if (type == NotificationType::APP_TERMINATING) { |
+ if (type == content::NOTIFICATION_APP_TERMINATING) { |
CancelAll(); |
- } else if (type == NotificationType::PREF_CHANGED) { |
+ } else if (type == chrome::NOTIFICATION_PREF_CHANGED) { |
std::string* name = Details<std::string>(details).ptr(); |
if (*name == prefs::kDesktopNotificationPosition) |
balloon_collection_->SetPositionPreference( |