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

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

Issue 2808003002: Start wiring up modal dialog experiment in PermissionRequestManager codepath (Closed)
Patch Set: fix bad rebase Created 3 years, 7 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_dialog_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_prompt_android.cc
diff --git a/chrome/browser/permissions/permission_prompt_android.cc b/chrome/browser/permissions/permission_prompt_android.cc
index e042101ab67e4aeac3be5e4af5e1e52e1440c09a..ffef04a0bdd77dc29391d4613ad83971ad93f5f0 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(
@@ -22,6 +23,17 @@ void PermissionPromptAndroid::SetDelegate(Delegate* delegate) {
}
void PermissionPromptAndroid::Show() {
+ // Grouped permission requests are not yet supported in dialogs.
+ // TODO(timloh): Handle grouped media permissions (camera + microphone).
+ if (delegate_->Requests().size() == 1) {
+ bool has_gesture = delegate_->Requests()[0]->GetGestureType() ==
+ PermissionRequestGestureType::GESTURE;
+ if (PermissionDialogDelegate::ShouldShowDialog(has_gesture)) {
+ PermissionDialogDelegate::Create(web_contents_, this);
+ return;
+ }
+ }
+
InfoBarService* infobar_service =
InfoBarService::FromWebContents(web_contents_);
if (!infobar_service)
« no previous file with comments | « chrome/browser/permissions/permission_dialog_delegate.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698