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

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

Issue 2619603002: Remove android_java_ui as it is not used (Closed)
Patch Set: Rebase to master Created 3 years, 11 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_manager.h" 5 #include "chrome/browser/permissions/permission_manager.h"
6 6
7 #include <stddef.h> 7 #include <stddef.h>
8 8
9 #include <memory> 9 #include <memory>
10 #include <utility> 10 #include <utility>
(...skipping 23 matching lines...) Expand all
34 #include "ppapi/features/features.h" 34 #include "ppapi/features/features.h"
35 35
36 #if BUILDFLAG(ENABLE_PLUGINS) 36 #if BUILDFLAG(ENABLE_PLUGINS)
37 #include "chrome/browser/plugins/flash_permission_context.h" 37 #include "chrome/browser/plugins/flash_permission_context.h"
38 #endif 38 #endif
39 39
40 #if defined(OS_ANDROID) || defined(OS_CHROMEOS) 40 #if defined(OS_ANDROID) || defined(OS_CHROMEOS)
41 #include "chrome/browser/media/protected_media_identifier_permission_context.h" 41 #include "chrome/browser/media/protected_media_identifier_permission_context.h"
42 #endif 42 #endif
43 43
44 #if BUILDFLAG(ANDROID_JAVA_UI) 44 #if defined(OS_ANDROID)
45 #include "chrome/browser/geolocation/geolocation_permission_context_android.h" 45 #include "chrome/browser/geolocation/geolocation_permission_context_android.h"
46 #else 46 #else
47 #include "chrome/browser/geolocation/geolocation_permission_context.h" 47 #include "chrome/browser/geolocation/geolocation_permission_context.h"
48 #endif 48 #endif
49 49
50 using blink::mojom::PermissionStatus; 50 using blink::mojom::PermissionStatus;
51 using content::PermissionType; 51 using content::PermissionType;
52 52
53 namespace { 53 namespace {
54 54
(...skipping 169 matching lines...) Expand 10 before | Expand all | Expand 10 after
224 : profile_(profile), 224 : profile_(profile),
225 weak_ptr_factory_(this) { 225 weak_ptr_factory_(this) {
226 permission_contexts_[PermissionType::MIDI_SYSEX] = 226 permission_contexts_[PermissionType::MIDI_SYSEX] =
227 base::MakeUnique<MidiPermissionContext>(profile); 227 base::MakeUnique<MidiPermissionContext>(profile);
228 permission_contexts_[PermissionType::PUSH_MESSAGING] = 228 permission_contexts_[PermissionType::PUSH_MESSAGING] =
229 base::MakeUnique<NotificationPermissionContext>( 229 base::MakeUnique<NotificationPermissionContext>(
230 profile, PermissionType::PUSH_MESSAGING); 230 profile, PermissionType::PUSH_MESSAGING);
231 permission_contexts_[PermissionType::NOTIFICATIONS] = 231 permission_contexts_[PermissionType::NOTIFICATIONS] =
232 base::MakeUnique<NotificationPermissionContext>( 232 base::MakeUnique<NotificationPermissionContext>(
233 profile, PermissionType::NOTIFICATIONS); 233 profile, PermissionType::NOTIFICATIONS);
234 #if !BUILDFLAG(ANDROID_JAVA_UI) 234 #if !defined(OS_ANDROID)
235 permission_contexts_[PermissionType::GEOLOCATION] = 235 permission_contexts_[PermissionType::GEOLOCATION] =
236 base::MakeUnique<GeolocationPermissionContext>(profile); 236 base::MakeUnique<GeolocationPermissionContext>(profile);
237 #else 237 #else
238 permission_contexts_[PermissionType::GEOLOCATION] = 238 permission_contexts_[PermissionType::GEOLOCATION] =
239 base::MakeUnique<GeolocationPermissionContextAndroid>(profile); 239 base::MakeUnique<GeolocationPermissionContextAndroid>(profile);
240 #endif 240 #endif
241 #if defined(OS_CHROMEOS) || defined(OS_ANDROID) 241 #if defined(OS_CHROMEOS) || defined(OS_ANDROID)
242 permission_contexts_[PermissionType::PROTECTED_MEDIA_IDENTIFIER] = 242 permission_contexts_[PermissionType::PROTECTED_MEDIA_IDENTIFIER] =
243 base::MakeUnique<ProtectedMediaIdentifierPermissionContext>(profile); 243 base::MakeUnique<ProtectedMediaIdentifierPermissionContext>(profile);
244 #endif 244 #endif
(...skipping 248 matching lines...) Expand 10 before | Expand all | Expand 10 after
493 PermissionType permission, 493 PermissionType permission,
494 const GURL& requesting_origin, 494 const GURL& requesting_origin,
495 const GURL& embedding_origin) { 495 const GURL& embedding_origin) {
496 if (IsConstantPermission(permission)) 496 if (IsConstantPermission(permission))
497 return GetContentSettingForConstantPermission(permission); 497 return GetContentSettingForConstantPermission(permission);
498 498
499 PermissionContextBase* context = GetPermissionContext(permission); 499 PermissionContextBase* context = GetPermissionContext(permission);
500 return context->GetPermissionStatus(requesting_origin.GetOrigin(), 500 return context->GetPermissionStatus(requesting_origin.GetOrigin(),
501 embedding_origin.GetOrigin()); 501 embedding_origin.GetOrigin());
502 } 502 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698