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

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

Issue 1382783002: Store USB device permissions in website settings. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Address bauerb@'s comments. Created 5 years, 2 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" 9 #include "chrome/browser/media/media_stream_camera_permission_context_factory.h"
10 #include "chrome/browser/media/media_stream_device_permission_context.h" 10 #include "chrome/browser/media/media_stream_device_permission_context.h"
11 #include "chrome/browser/media/media_stream_mic_permission_context_factory.h" 11 #include "chrome/browser/media/media_stream_mic_permission_context_factory.h"
12 #include "chrome/browser/media/midi_permission_context.h" 12 #include "chrome/browser/media/midi_permission_context.h"
13 #include "chrome/browser/media/midi_permission_context_factory.h" 13 #include "chrome/browser/media/midi_permission_context_factory.h"
14 #include "chrome/browser/notifications/notification_permission_context.h" 14 #include "chrome/browser/notifications/notification_permission_context.h"
15 #include "chrome/browser/notifications/notification_permission_context_factory.h " 15 #include "chrome/browser/notifications/notification_permission_context_factory.h "
16 #include "chrome/browser/profiles/profile.h" 16 #include "chrome/browser/profiles/profile.h"
17 #include "chrome/browser/push_messaging/push_messaging_permission_context.h" 17 #include "chrome/browser/push_messaging/push_messaging_permission_context.h"
18 #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"
19 #include "chrome/browser/storage/durable_storage_permission_context.h" 19 #include "chrome/browser/storage/durable_storage_permission_context.h"
20 #include "chrome/browser/storage/durable_storage_permission_context_factory.h" 20 #include "chrome/browser/storage/durable_storage_permission_context_factory.h"
21 #include "chrome/browser/usb/usb_permission_context.h"
22 #include "chrome/browser/usb/usb_permission_context_factory.h"
21 #include "content/public/browser/permission_type.h" 23 #include "content/public/browser/permission_type.h"
22 24
23 #if defined(OS_ANDROID) || defined(OS_CHROMEOS) 25 #if defined(OS_ANDROID) || defined(OS_CHROMEOS)
24 #include "chrome/browser/media/protected_media_identifier_permission_context.h" 26 #include "chrome/browser/media/protected_media_identifier_permission_context.h"
25 #include "chrome/browser/media/protected_media_identifier_permission_context_fac tory.h" 27 #include "chrome/browser/media/protected_media_identifier_permission_context_fac tory.h"
26 #endif 28 #endif
27 29
28 using content::PermissionType; 30 using content::PermissionType;
29 31
30 // static 32 // static
(...skipping 18 matching lines...) Expand all
49 case content::PermissionType::DURABLE_STORAGE: 51 case content::PermissionType::DURABLE_STORAGE:
50 return DurableStoragePermissionContextFactory::GetForProfile(profile); 52 return DurableStoragePermissionContextFactory::GetForProfile(profile);
51 case PermissionType::MIDI: 53 case PermissionType::MIDI:
52 // PermissionType::MIDI is a valid permission but does not have a 54 // PermissionType::MIDI is a valid permission but does not have a
53 // permission context. It has a constant value instead. 55 // permission context. It has a constant value instead.
54 break; 56 break;
55 case PermissionType::AUDIO_CAPTURE: 57 case PermissionType::AUDIO_CAPTURE:
56 return MediaStreamMicPermissionContextFactory::GetForProfile(profile); 58 return MediaStreamMicPermissionContextFactory::GetForProfile(profile);
57 case PermissionType::VIDEO_CAPTURE: 59 case PermissionType::VIDEO_CAPTURE:
58 return MediaStreamCameraPermissionContextFactory::GetForProfile(profile); 60 return MediaStreamCameraPermissionContextFactory::GetForProfile(profile);
61 case PermissionType::USB:
62 return UsbPermissionContextFactory::GetForProfile(profile);
59 default: 63 default:
60 NOTREACHED() << "No PermissionContext associated with " 64 NOTREACHED() << "No PermissionContext associated with "
61 << static_cast<int>(permission_type); 65 << static_cast<int>(permission_type);
62 break; 66 break;
63 } 67 }
64 68
65 return nullptr; 69 return nullptr;
66 } 70 }
67 71
68 // static 72 // static
69 const std::list<KeyedServiceBaseFactory*>& PermissionContext::GetFactories() { 73 const std::list<KeyedServiceBaseFactory*>& PermissionContext::GetFactories() {
70 // NOTE: this list has to stay in sync with the factories used by ::Get(). 74 // NOTE: this list has to stay in sync with the factories used by ::Get().
71 CR_DEFINE_STATIC_LOCAL(std::list<KeyedServiceBaseFactory*>, factories, ()); 75 CR_DEFINE_STATIC_LOCAL(std::list<KeyedServiceBaseFactory*>, factories, ());
72 76
73 if (factories.empty()) { 77 if (factories.empty()) {
74 factories.push_back(GeolocationPermissionContextFactory::GetInstance()); 78 factories.push_back(GeolocationPermissionContextFactory::GetInstance());
75 factories.push_back(MidiPermissionContextFactory::GetInstance()); 79 factories.push_back(MidiPermissionContextFactory::GetInstance());
76 factories.push_back(NotificationPermissionContextFactory::GetInstance()); 80 factories.push_back(NotificationPermissionContextFactory::GetInstance());
77 factories.push_back(PushMessagingPermissionContextFactory::GetInstance()); 81 factories.push_back(PushMessagingPermissionContextFactory::GetInstance());
78 #if defined(OS_ANDROID) || defined(OS_CHROMEOS) 82 #if defined(OS_ANDROID) || defined(OS_CHROMEOS)
79 factories.push_back( 83 factories.push_back(
80 ProtectedMediaIdentifierPermissionContextFactory::GetInstance()); 84 ProtectedMediaIdentifierPermissionContextFactory::GetInstance());
81 #endif 85 #endif
82 factories.push_back(DurableStoragePermissionContextFactory::GetInstance()); 86 factories.push_back(DurableStoragePermissionContextFactory::GetInstance());
83 factories.push_back(MediaStreamMicPermissionContextFactory::GetInstance()); 87 factories.push_back(MediaStreamMicPermissionContextFactory::GetInstance());
84 factories.push_back( 88 factories.push_back(
85 MediaStreamCameraPermissionContextFactory::GetInstance()); 89 MediaStreamCameraPermissionContextFactory::GetInstance());
90 factories.push_back(UsbPermissionContextFactory::GetInstance());
86 } 91 }
87 92
88 return factories; 93 return factories;
89 } 94 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698