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

Unified Diff: chrome/browser/media/protected_media_identifier_infobar_delegate.cc

Issue 1332293002: permissions: switch from explicitly passing queue controller to callbacks (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebase 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 side-by-side diff with in-line comments
Download patch
Index: chrome/browser/media/protected_media_identifier_infobar_delegate.cc
diff --git a/chrome/browser/media/protected_media_identifier_infobar_delegate.cc b/chrome/browser/media/protected_media_identifier_infobar_delegate.cc
index e23934e0abad9bfe95237869fca7d3417bb8dfe5..780324ae60079b579753a3fb9e0aa919bbe18141 100644
--- a/chrome/browser/media/protected_media_identifier_infobar_delegate.cc
+++ b/chrome/browser/media/protected_media_identifier_infobar_delegate.cc
@@ -5,8 +5,6 @@
#include "chrome/browser/media/protected_media_identifier_infobar_delegate.h"
#include "chrome/browser/infobars/infobar_service.h"
-#include "chrome/browser/permissions/permission_queue_controller.h"
-#include "chrome/browser/permissions/permission_request_id.h"
#include "chrome/common/url_constants.h"
#include "chrome/grit/generated_resources.h"
#include "components/infobars/core/infobar.h"
@@ -18,25 +16,24 @@
// static
infobars::InfoBar* ProtectedMediaIdentifierInfoBarDelegate::Create(
InfoBarService* infobar_service,
- PermissionQueueController* controller,
- const PermissionRequestID& id,
const GURL& requesting_frame,
- const std::string& display_languages) {
+ const std::string& display_languages,
+ const PermissionSetCallback& callback) {
return infobar_service->AddInfoBar(infobar_service->CreateConfirmInfoBar(
scoped_ptr<ConfirmInfoBarDelegate>(
new ProtectedMediaIdentifierInfoBarDelegate(
- controller, id, requesting_frame, display_languages))));
+ requesting_frame, display_languages, callback))));
}
ProtectedMediaIdentifierInfoBarDelegate::
ProtectedMediaIdentifierInfoBarDelegate(
- PermissionQueueController* controller,
- const PermissionRequestID& id,
const GURL& requesting_frame,
- const std::string& display_languages)
+ const std::string& display_languages,
+ const PermissionSetCallback& callback)
: PermissionInfobarDelegate(
- controller, id, requesting_frame,
- CONTENT_SETTINGS_TYPE_PROTECTED_MEDIA_IDENTIFIER),
+ requesting_frame,
+ CONTENT_SETTINGS_TYPE_PROTECTED_MEDIA_IDENTIFIER,
+ callback),
requesting_frame_(requesting_frame),
display_languages_(display_languages) {
}

Powered by Google App Engine
This is Rietveld 408576698