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

Side by Side 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 unified diff | Download patch
OLDNEW
1 // Copyright 2012 The Chromium Authors. All rights reserved. 1 // Copyright 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "chrome/browser/prefs/browser_prefs.h" 5 #include "chrome/browser/prefs/browser_prefs.h"
6 6
7 #include <string> 7 #include <string>
8 8
9 #include "base/files/file_util.h" 9 #include "base/files/file_util.h"
10 #include "base/metrics/histogram_macros.h" 10 #include "base/metrics/histogram_macros.h"
(...skipping 472 matching lines...) Expand 10 before | Expand all | Expand 10 after
483 chrome_prefs::RegisterProfilePrefs(registry); 483 chrome_prefs::RegisterProfilePrefs(registry);
484 dom_distiller::DistilledPagePrefs::RegisterProfilePrefs(registry); 484 dom_distiller::DistilledPagePrefs::RegisterProfilePrefs(registry);
485 DownloadPrefs::RegisterProfilePrefs(registry); 485 DownloadPrefs::RegisterProfilePrefs(registry);
486 HostContentSettingsMap::RegisterProfilePrefs(registry); 486 HostContentSettingsMap::RegisterProfilePrefs(registry);
487 IncognitoModePrefs::RegisterProfilePrefs(registry); 487 IncognitoModePrefs::RegisterProfilePrefs(registry);
488 InstantUI::RegisterProfilePrefs(registry); 488 InstantUI::RegisterProfilePrefs(registry);
489 NavigationCorrectionTabObserver::RegisterProfilePrefs(registry); 489 NavigationCorrectionTabObserver::RegisterProfilePrefs(registry);
490 MediaCaptureDevicesDispatcher::RegisterProfilePrefs(registry); 490 MediaCaptureDevicesDispatcher::RegisterProfilePrefs(registry);
491 MediaDeviceIDSalt::RegisterProfilePrefs(registry); 491 MediaDeviceIDSalt::RegisterProfilePrefs(registry);
492 MediaStreamDevicesController::RegisterProfilePrefs(registry); 492 MediaStreamDevicesController::RegisterProfilePrefs(registry);
493 NotifierStateTracker::RegisterProfilePrefs(registry);
493 ntp_snippets::BookmarkSuggestionsProvider::RegisterProfilePrefs(registry); 494 ntp_snippets::BookmarkSuggestionsProvider::RegisterProfilePrefs(registry);
494 ntp_snippets::ForeignSessionsSuggestionsProvider::RegisterProfilePrefs( 495 ntp_snippets::ForeignSessionsSuggestionsProvider::RegisterProfilePrefs(
495 registry); 496 registry);
496 ntp_snippets::RemoteSuggestionsProvider::RegisterProfilePrefs(registry); 497 ntp_snippets::RemoteSuggestionsProvider::RegisterProfilePrefs(registry);
497 ntp_snippets::ContentSuggestionsService::RegisterProfilePrefs(registry); 498 ntp_snippets::ContentSuggestionsService::RegisterProfilePrefs(registry);
498 ntp_snippets::RequestThrottler::RegisterProfilePrefs(registry); 499 ntp_snippets::RequestThrottler::RegisterProfilePrefs(registry);
499 ntp_snippets::UserClassifier::RegisterProfilePrefs(registry); 500 ntp_snippets::UserClassifier::RegisterProfilePrefs(registry);
500 password_bubble_experiment::RegisterPrefs(registry); 501 password_bubble_experiment::RegisterPrefs(registry);
501 password_manager::PasswordManager::RegisterProfilePrefs(registry); 502 password_manager::PasswordManager::RegisterProfilePrefs(registry);
502 PrefProxyConfigTrackerImpl::RegisterProfilePrefs(registry); 503 PrefProxyConfigTrackerImpl::RegisterProfilePrefs(registry);
(...skipping 19 matching lines...) Expand all
522 ExtensionWebUI::RegisterProfilePrefs(registry); 523 ExtensionWebUI::RegisterProfilePrefs(registry);
523 RegisterAnimationPolicyPrefs(registry); 524 RegisterAnimationPolicyPrefs(registry);
524 ToolbarActionsBar::RegisterProfilePrefs(registry); 525 ToolbarActionsBar::RegisterProfilePrefs(registry);
525 extensions::ActivityLog::RegisterProfilePrefs(registry); 526 extensions::ActivityLog::RegisterProfilePrefs(registry);
526 extensions::ComponentMigrationHelper::RegisterPrefs(registry); 527 extensions::ComponentMigrationHelper::RegisterPrefs(registry);
527 extensions::ExtensionPrefs::RegisterProfilePrefs(registry); 528 extensions::ExtensionPrefs::RegisterProfilePrefs(registry);
528 extensions::launch_util::RegisterProfilePrefs(registry); 529 extensions::launch_util::RegisterProfilePrefs(registry);
529 extensions::RuntimeAPI::RegisterPrefs(registry); 530 extensions::RuntimeAPI::RegisterPrefs(registry);
530 #endif // BUILDFLAG(ENABLE_EXTENSIONS) 531 #endif // BUILDFLAG(ENABLE_EXTENSIONS)
531 532
532 #if defined(ENABLE_NOTIFICATIONS) 533 #if BUILDFLAG(ENABLE_EXTENSIONS) && !defined(OS_ANDROID)
533 NotifierStateTracker::RegisterProfilePrefs(registry);
534 #endif
535
536 #if defined(ENABLE_NOTIFICATIONS) && BUILDFLAG(ENABLE_EXTENSIONS) && \
537 !defined(OS_ANDROID)
538 // The extension welcome notification requires a build that enables extensions 534 // The extension welcome notification requires a build that enables extensions
539 // and notifications, and uses the UI message center. 535 // and notifications, and uses the UI message center.
540 ExtensionWelcomeNotification::RegisterProfilePrefs(registry); 536 ExtensionWelcomeNotification::RegisterProfilePrefs(registry);
541 #endif 537 #endif
542 538
543 #if BUILDFLAG(ENABLE_PLUGINS) 539 #if BUILDFLAG(ENABLE_PLUGINS)
544 PluginsUI::RegisterProfilePrefs(registry); 540 PluginsUI::RegisterProfilePrefs(registry);
545 #endif 541 #endif
546 542
547 #if BUILDFLAG(ENABLE_PRINT_PREVIEW) 543 #if BUILDFLAG(ENABLE_PRINT_PREVIEW)
(...skipping 236 matching lines...) Expand 10 before | Expand all | Expand 10 after
784 // Added 8/2016. 780 // Added 8/2016.
785 profile_prefs->ClearPref(kStaticEncodings); 781 profile_prefs->ClearPref(kStaticEncodings);
786 profile_prefs->ClearPref(kRecentlySelectedEncoding); 782 profile_prefs->ClearPref(kRecentlySelectedEncoding);
787 783
788 // Added 9/2016. 784 // Added 9/2016.
789 profile_prefs->ClearPref(kWebKitUsesUniversalDetector); 785 profile_prefs->ClearPref(kWebKitUsesUniversalDetector);
790 profile_prefs->ClearPref(kWebKitAllowDisplayingInsecureContent); 786 profile_prefs->ClearPref(kWebKitAllowDisplayingInsecureContent);
791 } 787 }
792 788
793 } // namespace chrome 789 } // namespace chrome
OLDNEW
« 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