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

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

Issue 2808003002: Start wiring up modal dialog experiment in PermissionRequestManager codepath (Closed)
Patch Set: upd comment Created 3 years, 8 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/permissions/permission_prompt_android.cc
diff --git a/chrome/browser/permissions/permission_prompt_android.cc b/chrome/browser/permissions/permission_prompt_android.cc
index 35e1d74d200451239569c5afa6f6af53ca70aec5..b8ead4413b33c69933f7b0afdd75850c33fcc697 100644
--- a/chrome/browser/permissions/permission_prompt_android.cc
+++ b/chrome/browser/permissions/permission_prompt_android.cc
@@ -7,6 +7,7 @@
#include "base/memory/ptr_util.h"
#include "chrome/browser/infobars/infobar_service.h"
#include "chrome/browser/permissions/grouped_permission_infobar_delegate_android.h"
+#include "chrome/browser/permissions/permission_dialog_delegate.h"
#include "chrome/browser/permissions/permission_request.h"
PermissionPromptAndroid::PermissionPromptAndroid(
@@ -24,6 +25,18 @@ void PermissionPromptAndroid::SetDelegate(Delegate* delegate) {
void PermissionPromptAndroid::Show(
const std::vector<PermissionRequest*>& requests,
const std::vector<bool>& values) {
+ // Grouped permission requests are not yet supported in dialogs.
+ // TODO(timloh): Handle grouped media permissions (camera + microphone).
+ if (requests.size() == 1) {
+ bool has_gesture =
+ requests[0]->GetGestureType() == PermissionRequestGestureType::GESTURE;
+ if (PermissionDialogDelegate::ShouldShowDialog(has_gesture)) {
+ requests_ = requests;
+ PermissionDialogDelegate::Create(web_contents_, this);
+ return;
+ }
+ }
+
InfoBarService* infobar_service =
InfoBarService::FromWebContents(web_contents_);
if (!infobar_service)

Powered by Google App Engine
This is Rietveld 408576698