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

Unified Diff: chrome/browser/prefs/browser_prefs.cc

Issue 2555833002: Remove enable_notifications build flag and define (Closed)
Patch Set: Merge Created 4 years 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/prefs/browser_prefs.cc
diff --git a/chrome/browser/prefs/browser_prefs.cc b/chrome/browser/prefs/browser_prefs.cc
index 2f95eb4461bf1f0ce9d81596c1a427bb4fabc35f..c041812db2f5d4762cbb971fc4dc02d6daa7299c 100644
--- a/chrome/browser/prefs/browser_prefs.cc
+++ b/chrome/browser/prefs/browser_prefs.cc
@@ -490,6 +490,7 @@ void RegisterProfilePrefs(user_prefs::PrefRegistrySyncable* registry) {
MediaCaptureDevicesDispatcher::RegisterProfilePrefs(registry);
MediaDeviceIDSalt::RegisterProfilePrefs(registry);
MediaStreamDevicesController::RegisterProfilePrefs(registry);
+ NotifierStateTracker::RegisterProfilePrefs(registry);
ntp_snippets::BookmarkSuggestionsProvider::RegisterProfilePrefs(registry);
ntp_snippets::ForeignSessionsSuggestionsProvider::RegisterProfilePrefs(
registry);
@@ -529,12 +530,7 @@ void RegisterProfilePrefs(user_prefs::PrefRegistrySyncable* registry) {
extensions::RuntimeAPI::RegisterPrefs(registry);
#endif // BUILDFLAG(ENABLE_EXTENSIONS)
-#if defined(ENABLE_NOTIFICATIONS)
- NotifierStateTracker::RegisterProfilePrefs(registry);
-#endif
-
-#if defined(ENABLE_NOTIFICATIONS) && BUILDFLAG(ENABLE_EXTENSIONS) && \
- !defined(OS_ANDROID)
+#if BUILDFLAG(ENABLE_EXTENSIONS) && !defined(OS_ANDROID)
// The extension welcome notification requires a build that enables extensions
// and notifications, and uses the UI message center.
ExtensionWelcomeNotification::RegisterProfilePrefs(registry);
« no previous file with comments | « chrome/browser/permissions/permission_util.cc ('k') | chrome/browser/profiles/chrome_browser_main_extra_parts_profiles.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698