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

Side by Side Diff: chrome/browser/profiles/chrome_browser_main_extra_parts_profiles.cc

Issue 863263007: media: Enable ProtectedMediaIdentifierPermissionContext on ChromeOS. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase only Created 5 years, 10 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 unified diff | Download patch
OLDNEW
1 // Copyright 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 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/profiles/chrome_browser_main_extra_parts_profiles.h" 5 #include "chrome/browser/profiles/chrome_browser_main_extra_parts_profiles.h"
6 6
7 #include "chrome/browser/autocomplete/shortcuts_backend_factory.h" 7 #include "chrome/browser/autocomplete/shortcuts_backend_factory.h"
8 #include "chrome/browser/autofill/personal_data_manager_factory.h" 8 #include "chrome/browser/autofill/personal_data_manager_factory.h"
9 #include "chrome/browser/background/background_contents_service_factory.h" 9 #include "chrome/browser/background/background_contents_service_factory.h"
10 #include "chrome/browser/bookmarks/bookmark_model_factory.h" 10 #include "chrome/browser/bookmarks/bookmark_model_factory.h"
(...skipping 86 matching lines...) Expand 10 before | Expand all | Expand 10 after
97 #if defined(OS_CHROMEOS) 97 #if defined(OS_CHROMEOS)
98 #include "chrome/browser/supervised_user/chromeos/manager_password_service_facto ry.h" 98 #include "chrome/browser/supervised_user/chromeos/manager_password_service_facto ry.h"
99 #include "chrome/browser/supervised_user/chromeos/supervised_user_password_servi ce_factory.h" 99 #include "chrome/browser/supervised_user/chromeos/supervised_user_password_servi ce_factory.h"
100 #endif 100 #endif
101 #endif 101 #endif
102 102
103 #if defined(USE_AURA) 103 #if defined(USE_AURA)
104 #include "chrome/browser/ui/gesture_prefs_observer_factory_aura.h" 104 #include "chrome/browser/ui/gesture_prefs_observer_factory_aura.h"
105 #endif 105 #endif
106 106
107 #if defined(OS_ANDROID) 107 #if defined(OS_ANDROID) || defined(OS_CHROMEOS)
108 #include "chrome/browser/media/protected_media_identifier_permission_context_fac tory.h" 108 #include "chrome/browser/media/protected_media_identifier_permission_context_fac tory.h"
109 #else 109 #endif
110
111 #if !defined(OS_ANDROID)
110 #include "chrome/browser/profile_resetter/automatic_profile_resetter_factory.h" 112 #include "chrome/browser/profile_resetter/automatic_profile_resetter_factory.h"
111 #endif 113 #endif
112 114
113 #if defined(ENABLE_SPELLCHECK) 115 #if defined(ENABLE_SPELLCHECK)
114 #include "chrome/browser/spellchecker/spellcheck_factory.h" 116 #include "chrome/browser/spellchecker/spellcheck_factory.h"
115 #endif 117 #endif
116 118
117 #if defined(ENABLE_SERVICE_DISCOVERY) 119 #if defined(ENABLE_SERVICE_DISCOVERY)
118 #include "chrome/browser/local_discovery/privet_notifications_factory.h" 120 #include "chrome/browser/local_discovery/privet_notifications_factory.h"
119 #endif 121 #endif
(...skipping 46 matching lines...) Expand 10 before | Expand all | Expand 10 after
166 #endif 168 #endif
167 #if defined(ENABLE_BACKGROUND) 169 #if defined(ENABLE_BACKGROUND)
168 BackgroundContentsServiceFactory::GetInstance(); 170 BackgroundContentsServiceFactory::GetInstance();
169 #endif 171 #endif
170 BookmarkModelFactory::GetInstance(); 172 BookmarkModelFactory::GetInstance();
171 BookmarkUndoServiceFactory::GetInstance(); 173 BookmarkUndoServiceFactory::GetInstance();
172 #if defined(ENABLE_CAPTIVE_PORTAL_DETECTION) 174 #if defined(ENABLE_CAPTIVE_PORTAL_DETECTION)
173 CaptivePortalServiceFactory::GetInstance(); 175 CaptivePortalServiceFactory::GetInstance();
174 #endif 176 #endif
175 GeolocationPermissionContextFactory::GetInstance(); 177 GeolocationPermissionContextFactory::GetInstance();
176 #if defined(OS_ANDROID) 178 #if defined(OS_ANDROID) || defined(OS_CHROMEOS)
177 ProtectedMediaIdentifierPermissionContextFactory::GetInstance(); 179 ProtectedMediaIdentifierPermissionContextFactory::GetInstance();
178 #endif 180 #endif
179 #if defined(ENABLE_PRINT_PREVIEW) 181 #if defined(ENABLE_PRINT_PREVIEW)
180 CloudPrintProxyServiceFactory::GetInstance(); 182 CloudPrintProxyServiceFactory::GetInstance();
181 #endif 183 #endif
182 CookieSettings::Factory::GetInstance(); 184 CookieSettings::Factory::GetInstance();
183 #if defined(ENABLE_NOTIFICATIONS) 185 #if defined(ENABLE_NOTIFICATIONS)
184 DesktopNotificationServiceFactory::GetInstance(); 186 DesktopNotificationServiceFactory::GetInstance();
185 #endif 187 #endif
186 dom_distiller::DomDistillerServiceFactory::GetInstance(); 188 dom_distiller::DomDistillerServiceFactory::GetInstance();
(...skipping 91 matching lines...) Expand 10 before | Expand all | Expand 10 after
278 TemplateURLServiceFactory::GetInstance(); 280 TemplateURLServiceFactory::GetInstance();
279 #if defined(ENABLE_THEMES) 281 #if defined(ENABLE_THEMES)
280 ThemeServiceFactory::GetInstance(); 282 ThemeServiceFactory::GetInstance();
281 #endif 283 #endif
282 WebDataServiceFactory::GetInstance(); 284 WebDataServiceFactory::GetInstance();
283 } 285 }
284 286
285 void ChromeBrowserMainExtraPartsProfiles::PreProfileInit() { 287 void ChromeBrowserMainExtraPartsProfiles::PreProfileInit() {
286 EnsureBrowserContextKeyedServiceFactoriesBuilt(); 288 EnsureBrowserContextKeyedServiceFactoriesBuilt();
287 } 289 }
OLDNEW
« no previous file with comments | « chrome/browser/media/protected_media_identifier_permission_context_factory.cc ('k') | chrome/chrome_browser.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698