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

Unified Diff: chrome/browser/geolocation/geolocation_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: Remove unecessary includes 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/geolocation/geolocation_infobar_delegate.cc
diff --git a/chrome/browser/geolocation/geolocation_infobar_delegate.cc b/chrome/browser/geolocation/geolocation_infobar_delegate.cc
index f727ebc2811e4846b19a3808b0e95272a1b562d4..19e321de1e46148fdde539a8c8845f51429ecdf1 100644
--- a/chrome/browser/geolocation/geolocation_infobar_delegate.cc
+++ b/chrome/browser/geolocation/geolocation_infobar_delegate.cc
@@ -12,26 +12,26 @@
#include "grit/theme_resources.h"
#include "ui/base/l10n/l10n_util.h"
-
// static
infobars::InfoBar* GeolocationInfoBarDelegate::Create(
InfoBarService* infobar_service,
- PermissionQueueController* controller,
const PermissionRequestID& id,
const GURL& requesting_frame,
- const std::string& display_languages) {
+ const std::string& display_languages,
+ const base::Callback<void(bool, bool)>& callback) {
return infobar_service->AddInfoBar(infobar_service->CreateConfirmInfoBar(
scoped_ptr<ConfirmInfoBarDelegate>(new GeolocationInfoBarDelegate(
- controller, id, requesting_frame, display_languages))));
+ id, requesting_frame, display_languages, callback))));
}
GeolocationInfoBarDelegate::GeolocationInfoBarDelegate(
- PermissionQueueController* controller,
const PermissionRequestID& id,
const GURL& requesting_frame,
- const std::string& display_languages)
- : PermissionInfobarDelegate(controller, id, requesting_frame,
- CONTENT_SETTINGS_TYPE_GEOLOCATION),
+ const std::string& display_languages,
+ const base::Callback<void(bool, bool)>& callback)
+ : PermissionInfobarDelegate(id, requesting_frame,
+ CONTENT_SETTINGS_TYPE_GEOLOCATION,
+ callback),
requesting_frame_(requesting_frame),
display_languages_(display_languages) {
}

Powered by Google App Engine
This is Rietveld 408576698