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

Unified Diff: chrome/browser/content_settings/host_content_settings_map.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/content_settings/host_content_settings_map.cc
===================================================================
--- chrome/browser/content_settings/host_content_settings_map.cc (revision 91968)
+++ chrome/browser/content_settings/host_content_settings_map.cc (working copy)
@@ -18,6 +18,7 @@
#include "chrome/browser/prefs/pref_service.h"
#include "chrome/browser/prefs/scoped_user_pref_update.h"
#include "chrome/browser/profiles/profile.h"
+#include "chrome/common/chrome_notification_types.h"
#include "chrome/common/chrome_switches.h"
#include "chrome/common/pref_names.h"
#include "chrome/common/url_constants.h"
@@ -25,7 +26,6 @@
#include "content/browser/user_metrics.h"
#include "content/common/notification_service.h"
#include "content/common/notification_source.h"
-#include "content/common/notification_type.h"
#include "googleurl/src/gurl.h"
#include "net/base/net_errors.h"
#include "net/base/net_util.h"
@@ -123,7 +123,7 @@
pref_change_registrar_.Init(prefs);
pref_change_registrar_.Add(prefs::kBlockThirdPartyCookies, this);
- notification_registrar_.Add(this, NotificationType::PROFILE_DESTROYED,
+ notification_registrar_.Add(this, chrome::NOTIFICATION_PROFILE_DESTROYED,
Source<Profile>(profile_));
}
@@ -446,12 +446,12 @@
profile_->GetPrefs()->SetBoolean(prefs::kBlockThirdPartyCookies, block);
}
-void HostContentSettingsMap::Observe(NotificationType type,
+void HostContentSettingsMap::Observe(int type,
const NotificationSource& source,
const NotificationDetails& details) {
DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
- if (type == NotificationType::PREF_CHANGED) {
+ if (type == chrome::NOTIFICATION_PREF_CHANGED) {
DCHECK_EQ(profile_->GetPrefs(), Source<PrefService>(source).ptr());
if (updating_preferences_)
return;
@@ -468,7 +468,7 @@
NOTREACHED() << "Unexpected preference observed";
return;
}
- } else if (type == NotificationType::PROFILE_DESTROYED) {
+ } else if (type == chrome::NOTIFICATION_PROFILE_DESTROYED) {
DCHECK_EQ(profile_, Source<Profile>(source).ptr());
UnregisterObservers();
} else {
@@ -504,7 +504,7 @@
if (!profile_)
return;
pref_change_registrar_.RemoveAll();
- notification_registrar_.Remove(this, NotificationType::PROFILE_DESTROYED,
+ notification_registrar_.Remove(this, chrome::NOTIFICATION_PROFILE_DESTROYED,
Source<Profile>(profile_));
profile_ = NULL;
}
« no previous file with comments | « chrome/browser/content_settings/host_content_settings_map.h ('k') | chrome/browser/content_settings/mock_settings_observer.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698