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

Side by Side Diff: chrome/browser/media/protected_media_identifier_permission_context_factory.cc

Issue 1312453005: Removed Profile::GetHostContentSettingsMap (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fixed patch conflict Created 5 years, 3 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/media/protected_media_identifier_permission_context_fac tory.h" 5 #include "chrome/browser/media/protected_media_identifier_permission_context_fac tory.h"
6 6
7 #include "chrome/browser/media/protected_media_identifier_permission_context.h" 7 #include "chrome/browser/media/protected_media_identifier_permission_context.h"
8 #include "chrome/browser/profiles/incognito_helpers.h" 8 #include "chrome/browser/profiles/incognito_helpers.h"
9 #include "chrome/browser/profiles/profile.h" 9 #include "chrome/browser/profiles/profile.h"
10 #include "chrome/common/pref_names.h" 10 #include "chrome/common/pref_names.h"
(...skipping 10 matching lines...) Expand all
21 21
22 // static 22 // static
23 ProtectedMediaIdentifierPermissionContextFactory* 23 ProtectedMediaIdentifierPermissionContextFactory*
24 ProtectedMediaIdentifierPermissionContextFactory::GetInstance() { 24 ProtectedMediaIdentifierPermissionContextFactory::GetInstance() {
25 return base::Singleton< 25 return base::Singleton<
26 ProtectedMediaIdentifierPermissionContextFactory>::get(); 26 ProtectedMediaIdentifierPermissionContextFactory>::get();
27 } 27 }
28 28
29 ProtectedMediaIdentifierPermissionContextFactory:: 29 ProtectedMediaIdentifierPermissionContextFactory::
30 ProtectedMediaIdentifierPermissionContextFactory() 30 ProtectedMediaIdentifierPermissionContextFactory()
31 : BrowserContextKeyedServiceFactory( 31 : PermissionContextFactoryBase(
32 "ProtectedMediaIdentifierPermissionContext", 32 "ProtectedMediaIdentifierPermissionContext",
33 BrowserContextDependencyManager::GetInstance()) { 33 BrowserContextDependencyManager::GetInstance()) {
34 } 34 }
35 35
36 ProtectedMediaIdentifierPermissionContextFactory:: 36 ProtectedMediaIdentifierPermissionContextFactory::
37 ~ProtectedMediaIdentifierPermissionContextFactory() { 37 ~ProtectedMediaIdentifierPermissionContextFactory() {
38 } 38 }
39 39
40 KeyedService* 40 KeyedService*
41 ProtectedMediaIdentifierPermissionContextFactory::BuildServiceInstanceFor( 41 ProtectedMediaIdentifierPermissionContextFactory::BuildServiceInstanceFor(
42 content::BrowserContext* profile) const { 42 content::BrowserContext* profile) const {
43 return new ProtectedMediaIdentifierPermissionContext( 43 return new ProtectedMediaIdentifierPermissionContext(
44 static_cast<Profile*>(profile)); 44 static_cast<Profile*>(profile));
45 } 45 }
46 46
47 void 47 void
48 ProtectedMediaIdentifierPermissionContextFactory::RegisterProfilePrefs( 48 ProtectedMediaIdentifierPermissionContextFactory::RegisterProfilePrefs(
49 user_prefs::PrefRegistrySyncable* registry) { 49 user_prefs::PrefRegistrySyncable* registry) {
50 #if defined(OS_ANDROID) 50 #if defined(OS_ANDROID)
51 registry->RegisterBooleanPref(prefs::kProtectedMediaIdentifierEnabled, true); 51 registry->RegisterBooleanPref(prefs::kProtectedMediaIdentifierEnabled, true);
52 #endif 52 #endif
53 } 53 }
54
55 content::BrowserContext*
56 ProtectedMediaIdentifierPermissionContextFactory::GetBrowserContextToUse(
57 content::BrowserContext* context) const {
58 return chrome::GetBrowserContextOwnInstanceInIncognito(context);
59 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698