Index: chrome/browser/ui/views/content_setting_bubble_contents.cc |
=================================================================== |
--- chrome/browser/ui/views/content_setting_bubble_contents.cc (revision 91968) |
+++ chrome/browser/ui/views/content_setting_bubble_contents.cc (working copy) |
@@ -16,8 +16,8 @@ |
#include "chrome/browser/ui/views/browser_dialogs.h" |
#include "chrome/browser/ui/views/bubble/bubble.h" |
#include "content/browser/tab_contents/tab_contents.h" |
+#include "content/common/content_notification_types.h" |
#include "content/common/notification_source.h" |
-#include "content/common/notification_type.h" |
#include "grit/generated_resources.h" |
#include "ui/base/l10n/l10n_util.h" |
#include "views/controls/button/radio_button.h" |
@@ -105,7 +105,7 @@ |
custom_link_(NULL), |
manage_link_(NULL), |
close_button_(NULL) { |
- registrar_.Add(this, NotificationType::TAB_CONTENTS_DESTROYED, |
+ registrar_.Add(this, content::NOTIFICATION_TAB_CONTENTS_DESTROYED, |
Source<TabContents>(tab_contents)); |
} |
@@ -168,10 +168,10 @@ |
content_setting_bubble_model_->OnPopupClicked(i->second); |
} |
-void ContentSettingBubbleContents::Observe(NotificationType type, |
+void ContentSettingBubbleContents::Observe(int type, |
const NotificationSource& source, |
const NotificationDetails& details) { |
- DCHECK(type == NotificationType::TAB_CONTENTS_DESTROYED); |
+ DCHECK(type == content::NOTIFICATION_TAB_CONTENTS_DESTROYED); |
DCHECK(source == Source<TabContents>(tab_contents_)); |
tab_contents_ = NULL; |
} |