Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(533)

Unified Diff: chrome/browser/ui/content_settings/content_setting_bubble_model.cc

Issue 7327007: Moving notification types which are chrome specific to a new header file chrome_notification_type... (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: '' Created 9 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: chrome/browser/ui/content_settings/content_setting_bubble_model.cc
===================================================================
--- chrome/browser/ui/content_settings/content_setting_bubble_model.cc (revision 91968)
+++ chrome/browser/ui/content_settings/content_setting_bubble_model.cc (working copy)
@@ -17,6 +17,7 @@
#include "chrome/browser/ui/browser.h"
#include "chrome/browser/ui/collected_cookies_infobar_delegate.h"
#include "chrome/browser/ui/tab_contents/tab_contents_wrapper.h"
+#include "chrome/common/chrome_notification_types.h"
#include "chrome/common/pref_names.h"
#include "chrome/common/render_messages.h"
#include "content/browser/renderer_host/render_view_host.h"
@@ -327,7 +328,7 @@
if (!tab_contents())
return;
NotificationService::current()->Notify(
- NotificationType::COLLECTED_COOKIES_SHOWN,
+ chrome::NOTIFICATION_COLLECTED_COOKIES_SHOWN,
Source<TabSpecificContentSettings>(tab_contents()->content_settings()),
NotificationService::NoDetails());
browser()->ShowCollectedCookiesDialog(tab_contents()->tab_contents());
@@ -506,9 +507,9 @@
: tab_contents_(tab_contents),
profile_(profile),
content_type_(content_type) {
- registrar_.Add(this, NotificationType::TAB_CONTENTS_DESTROYED,
+ registrar_.Add(this, content::NOTIFICATION_TAB_CONTENTS_DESTROYED,
Source<TabContents>(tab_contents->tab_contents()));
- registrar_.Add(this, NotificationType::PROFILE_DESTROYED,
+ registrar_.Add(this, chrome::NOTIFICATION_PROFILE_DESTROYED,
Source<Profile>(profile_));
}
@@ -535,15 +536,15 @@
bubble_content_.resource_identifiers.insert(resource_identifier);
}
-void ContentSettingBubbleModel::Observe(NotificationType type,
+void ContentSettingBubbleModel::Observe(int type,
const NotificationSource& source,
const NotificationDetails& details) {
- switch (type.value) {
- case NotificationType::TAB_CONTENTS_DESTROYED:
+ switch (type) {
+ case content::NOTIFICATION_TAB_CONTENTS_DESTROYED:
DCHECK(source == Source<TabContents>(tab_contents_->tab_contents()));
tab_contents_ = NULL;
break;
- case NotificationType::PROFILE_DESTROYED:
+ case chrome::NOTIFICATION_PROFILE_DESTROYED:
DCHECK(source == Source<Profile>(profile_));
profile_ = NULL;
break;
« no previous file with comments | « chrome/browser/ui/content_settings/content_setting_bubble_model.h ('k') | chrome/browser/ui/find_bar/find_bar_controller.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698