chrome/browser/profiles/chrome_browser_main_extra_parts_profiles.cc - Issue 1871343002: Remove PermissionContext factories

Unified Diff: chrome/browser/profiles/chrome_browser_main_extra_parts_profiles.cc

Issue 1871343002: Remove PermissionContext factories (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Created 4 years, 8 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

« chrome/browser/permissions/permission_manager.h ('K') | « chrome/browser/permissions/permission_manager_factory.cc ('k') | chrome/browser/profiles/off_the_record_profile_impl.cc » ('j') | chrome/browser/push_messaging/push_messaging_permission_context_unittest.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/profiles/chrome_browser_main_extra_parts_profiles.cc

diff --git a/chrome/browser/profiles/chrome_browser_main_extra_parts_profiles.cc b/chrome/browser/profiles/chrome_browser_main_extra_parts_profiles.cc

index 03ad4ca1a320c01458461dc5d61e78d36a04a0be..285469aac38eda04ee82beab554fc78f2c49a8fb 100644

--- a/chrome/browser/profiles/chrome_browser_main_extra_parts_profiles.cc

+++ b/chrome/browser/profiles/chrome_browser_main_extra_parts_profiles.cc

@@ -23,13 +23,11 @@

#include "chrome/browser/engagement/site_engagement_service.h"

#include "chrome/browser/engagement/site_engagement_service_factory.h"

#include "chrome/browser/favicon/favicon_service_factory.h"

-#include "chrome/browser/geolocation/geolocation_permission_context_factory.h"

#include "chrome/browser/google/google_url_tracker_factory.h"

#include "chrome/browser/history/history_service_factory.h"

#include "chrome/browser/invalidation/profile_invalidation_provider_factory.h"

#include "chrome/browser/media_galleries/media_galleries_preferences_factory.h"

#include "chrome/browser/notifications/extension_welcome_notification_factory.h"

-#include "chrome/browser/notifications/notification_permission_context_factory.h"

#include "chrome/browser/notifications/notifier_state_tracker_factory.h"

#include "chrome/browser/ntp_snippets/ntp_snippets_service_factory.h"

#include "chrome/browser/password_manager/password_manager_setting_migrator_service_factory.h"

@@ -110,9 +108,7 @@

#endif

-#if defined(OS_ANDROID) || defined(OS_CHROMEOS)

-#include "chrome/browser/media/protected_media_identifier_permission_context_factory.h"

-#else

+#if !defined(OS_ANDROID) && !defined(OS_CHROMEOS)

#include "chrome/browser/signin/cross_device_promo_factory.h"

#endif

@@ -195,10 +191,6 @@ EnsureBrowserContextKeyedServiceFactoriesBuilt() {

#if defined(OS_ANDROID)

chrome::android::DataUseUITabModelFactory::GetInstance();

#endif

- GeolocationPermissionContextFactory::GetInstance();

-#if defined(OS_ANDROID) || defined(OS_CHROMEOS)

- ProtectedMediaIdentifierPermissionContextFactory::GetInstance();

-#endif

#if defined(ENABLE_PRINT_PREVIEW)

CloudPrintProxyServiceFactory::GetInstance();

#endif

@@ -210,7 +202,6 @@ EnsureBrowserContextKeyedServiceFactoriesBuilt() {

#if defined(ENABLE_EXTENSIONS)

ExtensionWelcomeNotificationFactory::GetInstance();

#endif

- NotificationPermissionContextFactory::GetInstance();

NotifierStateTrackerFactory::GetInstance();

#endif // defined(ENABLE_NOTIFICATIONS)

dom_distiller::DomDistillerServiceFactory::GetInstance();