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

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

Issue 2458453002: [sensors] Add Permission guard to the generic sensor apis.
Patch Set: Created 4 years, 1 month 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 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 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_infobar_delegate.h" 5 #include "chrome/browser/permissions/permission_infobar_delegate.h"
6 6
7 #include "build/build_config.h" 7 #include "build/build_config.h"
8 #include "chrome/browser/geolocation/geolocation_infobar_delegate_android.h" 8 #include "chrome/browser/geolocation/geolocation_infobar_delegate_android.h"
9 #include "chrome/browser/infobars/infobar_service.h" 9 #include "chrome/browser/infobars/infobar_service.h"
10 #include "chrome/browser/media/midi_permission_infobar_delegate_android.h" 10 #include "chrome/browser/media/midi_permission_infobar_delegate_android.h"
11 #include "chrome/browser/media/protected_media_identifier_infobar_delegate_andro id.h" 11 #include "chrome/browser/media/protected_media_identifier_infobar_delegate_andro id.h"
12 #include "chrome/browser/notifications/notification_permission_infobar_delegate. h" 12 #include "chrome/browser/notifications/notification_permission_infobar_delegate. h"
13 #include "chrome/browser/permissions/permission_request.h" 13 #include "chrome/browser/permissions/permission_request.h"
14 #include "chrome/browser/permissions/permission_uma_util.h" 14 #include "chrome/browser/permissions/permission_uma_util.h"
15 #include "chrome/browser/sensor/sensor_permission_infobar_delegate_android.h"
15 #include "chrome/grit/generated_resources.h" 16 #include "chrome/grit/generated_resources.h"
16 #include "components/infobars/core/infobar.h" 17 #include "components/infobars/core/infobar.h"
17 #include "components/url_formatter/elide_url.h" 18 #include "components/url_formatter/elide_url.h"
18 #include "ui/base/l10n/l10n_util.h" 19 #include "ui/base/l10n/l10n_util.h"
19 20
20 // static 21 // static
21 infobars::InfoBar* PermissionInfoBarDelegate::Create( 22 infobars::InfoBar* PermissionInfoBarDelegate::Create(
22 content::PermissionType type, 23 content::PermissionType type,
23 InfoBarService* infobar_service, 24 InfoBarService* infobar_service,
24 const GURL& requesting_frame, 25 const GURL& requesting_frame,
(...skipping 12 matching lines...) Expand all
37 return infobar_service->AddInfoBar( 38 return infobar_service->AddInfoBar(
38 CreatePermissionInfoBar(std::unique_ptr<PermissionInfoBarDelegate>( 39 CreatePermissionInfoBar(std::unique_ptr<PermissionInfoBarDelegate>(
39 new NotificationPermissionInfoBarDelegate( 40 new NotificationPermissionInfoBarDelegate(
40 requesting_frame, user_gesture, profile, callback)))); 41 requesting_frame, user_gesture, profile, callback))));
41 #endif // ENABLE_NOTIFICATIONS 42 #endif // ENABLE_NOTIFICATIONS
42 case content::PermissionType::MIDI_SYSEX: 43 case content::PermissionType::MIDI_SYSEX:
43 return infobar_service->AddInfoBar( 44 return infobar_service->AddInfoBar(
44 CreatePermissionInfoBar(std::unique_ptr<PermissionInfoBarDelegate>( 45 CreatePermissionInfoBar(std::unique_ptr<PermissionInfoBarDelegate>(
45 new MidiPermissionInfoBarDelegateAndroid( 46 new MidiPermissionInfoBarDelegateAndroid(
46 requesting_frame, user_gesture, profile, callback)))); 47 requesting_frame, user_gesture, profile, callback))));
48 case content::PermissionType::SENSORS:
49 return infobar_service->AddInfoBar(
50 CreatePermissionInfoBar(std::unique_ptr<PermissionInfoBarDelegate>(
51 new SensorPermissionInfoBarDelegateAndroid(
52 requesting_frame, user_gesture, profile, callback))));
47 case content::PermissionType::PROTECTED_MEDIA_IDENTIFIER: 53 case content::PermissionType::PROTECTED_MEDIA_IDENTIFIER:
48 return infobar_service->AddInfoBar( 54 return infobar_service->AddInfoBar(
49 CreatePermissionInfoBar(std::unique_ptr<PermissionInfoBarDelegate>( 55 CreatePermissionInfoBar(std::unique_ptr<PermissionInfoBarDelegate>(
50 new ProtectedMediaIdentifierInfoBarDelegateAndroid( 56 new ProtectedMediaIdentifierInfoBarDelegateAndroid(
51 requesting_frame, user_gesture, profile, callback)))); 57 requesting_frame, user_gesture, profile, callback))));
52 default: 58 default:
53 NOTREACHED(); 59 NOTREACHED();
54 return nullptr; 60 return nullptr;
55 } 61 }
56 } 62 }
(...skipping 85 matching lines...) Expand 10 before | Expand all | Expand 10 after
142 148
143 SetPermission(update_content_setting, DENIED); 149 SetPermission(update_content_setting, DENIED);
144 return true; 150 return true;
145 } 151 }
146 152
147 void PermissionInfoBarDelegate::SetPermission(bool update_content_setting, 153 void PermissionInfoBarDelegate::SetPermission(bool update_content_setting,
148 PermissionAction decision) { 154 PermissionAction decision) {
149 action_taken_ = true; 155 action_taken_ = true;
150 callback_.Run(update_content_setting, decision); 156 callback_.Run(update_content_setting, decision);
151 } 157 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698