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

Unified Diff: chrome/browser/permissions/permission_queue_controller.cc

Issue 2443463003: Remove PermissionInfoBarDelegate from desktop builds. (Closed)
Patch Set: Add comment explaining lifetime Created 4 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/browser/permissions/permission_infobar_delegate.cc ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/permissions/permission_queue_controller.cc
diff --git a/chrome/browser/permissions/permission_queue_controller.cc b/chrome/browser/permissions/permission_queue_controller.cc
index 31d4b88d1a481fdea25f0fbe4b1f27b24ab179ce..2e272bdbee1349d1a024141d7fa6597d5c03264c 100644
--- a/chrome/browser/permissions/permission_queue_controller.cc
+++ b/chrome/browser/permissions/permission_queue_controller.cc
@@ -6,11 +6,7 @@
#include "chrome/browser/chrome_notification_types.h"
#include "chrome/browser/content_settings/host_content_settings_map_factory.h"
-#include "chrome/browser/geolocation/geolocation_infobar_delegate_android.h"
#include "chrome/browser/infobars/infobar_service.h"
-#include "chrome/browser/media/midi_permission_infobar_delegate_android.h"
-#include "chrome/browser/media/protected_media_identifier_infobar_delegate_android.h"
-#include "chrome/browser/notifications/notification_permission_infobar_delegate.h"
#include "chrome/browser/permissions/permission_infobar_delegate.h"
#include "chrome/browser/permissions/permission_request.h"
#include "chrome/browser/permissions/permission_request_id.h"
@@ -123,34 +119,10 @@ void PermissionQueueController::PendingInfobarRequest::CreateInfoBar(
PermissionInfoBarDelegate::PermissionSetCallback callback = base::Bind(
&PermissionQueueController::OnPermissionSet, base::Unretained(controller),
id_, requesting_frame_, embedder_, user_gesture_);
- switch (type_) {
- case content::PermissionType::GEOLOCATION:
- infobar_ = GeolocationInfoBarDelegateAndroid::Create(
- GetInfoBarService(id_), requesting_frame_, user_gesture_, profile_,
- callback);
- break;
-#if defined(ENABLE_NOTIFICATIONS)
- case content::PermissionType::NOTIFICATIONS:
- case content::PermissionType::PUSH_MESSAGING:
- infobar_ = NotificationPermissionInfoBarDelegate::Create(
- GetInfoBarService(id_), requesting_frame_, user_gesture_, profile_,
- callback);
- break;
-#endif // ENABLE_NOTIFICATIONS
- case content::PermissionType::MIDI_SYSEX:
- infobar_ = MidiPermissionInfoBarDelegateAndroid::Create(
- GetInfoBarService(id_), requesting_frame_, user_gesture_, profile_,
- callback);
- break;
- case content::PermissionType::PROTECTED_MEDIA_IDENTIFIER:
- infobar_ = ProtectedMediaIdentifierInfoBarDelegateAndroid::Create(
- GetInfoBarService(id_), requesting_frame_, user_gesture_, profile_,
- callback);
- break;
- default:
- NOTREACHED();
- break;
- }
+
+ infobar_ = PermissionInfoBarDelegate::Create(type_, GetInfoBarService(id_),
+ requesting_frame_, user_gesture_,
+ profile_, callback);
}
PermissionQueueController::PermissionQueueController(
« no previous file with comments | « chrome/browser/permissions/permission_infobar_delegate.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698