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

Side by Side Diff: chrome/browser/permissions/permission_context.cc

Issue 1311783007: refactor to Introduce AUDIO_CAPTURE and VIDEO_CAPTURE permissions. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: 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 2015 The Chromium Authors. All rights reserved. 1 // Copyright 2015 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/permissions/permission_context.h" 5 #include "chrome/browser/permissions/permission_context.h"
6 6
7 #include "chrome/browser/geolocation/geolocation_permission_context.h" 7 #include "chrome/browser/geolocation/geolocation_permission_context.h"
8 #include "chrome/browser/geolocation/geolocation_permission_context_factory.h" 8 #include "chrome/browser/geolocation/geolocation_permission_context_factory.h"
9 #include "chrome/browser/media/media_stream_camera_permission_context_factory.h"
10 #include "chrome/browser/media/media_stream_device_permission_context.h"
11 #include "chrome/browser/media/media_stream_mic_permission_context_factory.h"
9 #include "chrome/browser/media/midi_permission_context.h" 12 #include "chrome/browser/media/midi_permission_context.h"
10 #include "chrome/browser/media/midi_permission_context_factory.h" 13 #include "chrome/browser/media/midi_permission_context_factory.h"
11 #include "chrome/browser/notifications/notification_permission_context.h" 14 #include "chrome/browser/notifications/notification_permission_context.h"
12 #include "chrome/browser/notifications/notification_permission_context_factory.h " 15 #include "chrome/browser/notifications/notification_permission_context_factory.h "
13 #include "chrome/browser/profiles/profile.h" 16 #include "chrome/browser/profiles/profile.h"
14 #include "chrome/browser/push_messaging/push_messaging_permission_context.h" 17 #include "chrome/browser/push_messaging/push_messaging_permission_context.h"
15 #include "chrome/browser/push_messaging/push_messaging_permission_context_factor y.h" 18 #include "chrome/browser/push_messaging/push_messaging_permission_context_factor y.h"
16 #include "chrome/browser/storage/durable_storage_permission_context.h" 19 #include "chrome/browser/storage/durable_storage_permission_context.h"
17 #include "chrome/browser/storage/durable_storage_permission_context_factory.h" 20 #include "chrome/browser/storage/durable_storage_permission_context_factory.h"
18 #include "content/public/browser/permission_type.h" 21 #include "content/public/browser/permission_type.h"
(...skipping 23 matching lines...) Expand all
42 case PermissionType::PROTECTED_MEDIA_IDENTIFIER: 45 case PermissionType::PROTECTED_MEDIA_IDENTIFIER:
43 return ProtectedMediaIdentifierPermissionContextFactory::GetForProfile( 46 return ProtectedMediaIdentifierPermissionContextFactory::GetForProfile(
44 profile); 47 profile);
45 #endif 48 #endif
46 case content::PermissionType::DURABLE_STORAGE: 49 case content::PermissionType::DURABLE_STORAGE:
47 return DurableStoragePermissionContextFactory::GetForProfile(profile); 50 return DurableStoragePermissionContextFactory::GetForProfile(profile);
48 case PermissionType::MIDI: 51 case PermissionType::MIDI:
49 // PermissionType::MIDI is a valid permission but does not have a 52 // PermissionType::MIDI is a valid permission but does not have a
50 // permission context. It has a constant value instead. 53 // permission context. It has a constant value instead.
51 break; 54 break;
55 case PermissionType::AUDIO_CAPTURE:
56 return MediaStreamMicPermissionContextFactory::GetForProfile(profile);
57 case PermissionType::VIDEO_CAPTURE:
58 return MediaStreamCameraPermissionContextFactory::GetForProfile(profile);
52 default: 59 default:
53 NOTREACHED() << "No PermissionContext associated with " 60 NOTREACHED() << "No PermissionContext associated with "
54 << static_cast<int>(permission_type); 61 << static_cast<int>(permission_type);
55 break; 62 break;
56 } 63 }
57 64
58 return nullptr; 65 return nullptr;
59 } 66 }
60 67
61 // static 68 // static
62 const std::list<KeyedServiceBaseFactory*>& PermissionContext::GetFactories() { 69 const std::list<KeyedServiceBaseFactory*>& PermissionContext::GetFactories() {
63 // NOTE: this list has to stay in sync with the factories used by ::Get(). 70 // NOTE: this list has to stay in sync with the factories used by ::Get().
64 CR_DEFINE_STATIC_LOCAL(std::list<KeyedServiceBaseFactory*>, factories, ()); 71 CR_DEFINE_STATIC_LOCAL(std::list<KeyedServiceBaseFactory*>, factories, ());
65 72
66 if (factories.empty()) { 73 if (factories.empty()) {
67 factories.push_back(GeolocationPermissionContextFactory::GetInstance()); 74 factories.push_back(GeolocationPermissionContextFactory::GetInstance());
68 factories.push_back(MidiPermissionContextFactory::GetInstance()); 75 factories.push_back(MidiPermissionContextFactory::GetInstance());
69 factories.push_back(NotificationPermissionContextFactory::GetInstance()); 76 factories.push_back(NotificationPermissionContextFactory::GetInstance());
70 factories.push_back(PushMessagingPermissionContextFactory::GetInstance()); 77 factories.push_back(PushMessagingPermissionContextFactory::GetInstance());
71 #if defined(OS_ANDROID) || defined(OS_CHROMEOS) 78 #if defined(OS_ANDROID) || defined(OS_CHROMEOS)
72 factories.push_back( 79 factories.push_back(
73 ProtectedMediaIdentifierPermissionContextFactory::GetInstance()); 80 ProtectedMediaIdentifierPermissionContextFactory::GetInstance());
74 #endif 81 #endif
75 factories.push_back(DurableStoragePermissionContextFactory::GetInstance()); 82 factories.push_back(DurableStoragePermissionContextFactory::GetInstance());
83 factories.push_back(MediaStreamMicPermissionContextFactory::GetInstance());
84 factories.push_back(
85 MediaStreamCameraPermissionContextFactory::GetInstance());
76 } 86 }
77 87
78 return factories; 88 return factories;
79 } 89 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698