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

Side by Side 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 unified diff | Download patch
OLDNEW
1 // Copyright 2016 The Chromium Authors. All rights reserved. 1 // Copyright 2016 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "chrome/browser/permissions/permission_prompt_android.h" 5 #include "chrome/browser/permissions/permission_prompt_android.h"
6 6
7 #include "base/memory/ptr_util.h" 7 #include "base/memory/ptr_util.h"
8 #include "chrome/browser/infobars/infobar_service.h" 8 #include "chrome/browser/infobars/infobar_service.h"
9 #include "chrome/browser/permissions/grouped_permission_infobar_delegate_android .h" 9 #include "chrome/browser/permissions/grouped_permission_infobar_delegate_android .h"
10 #include "chrome/browser/permissions/permission_dialog_delegate.h"
10 #include "chrome/browser/permissions/permission_request.h" 11 #include "chrome/browser/permissions/permission_request.h"
11 12
12 PermissionPromptAndroid::PermissionPromptAndroid( 13 PermissionPromptAndroid::PermissionPromptAndroid(
13 content::WebContents* web_contents) 14 content::WebContents* web_contents)
14 : web_contents_(web_contents), delegate_(nullptr) { 15 : web_contents_(web_contents), delegate_(nullptr) {
15 DCHECK(web_contents); 16 DCHECK(web_contents);
16 } 17 }
17 18
18 PermissionPromptAndroid::~PermissionPromptAndroid() {} 19 PermissionPromptAndroid::~PermissionPromptAndroid() {}
19 20
20 void PermissionPromptAndroid::SetDelegate(Delegate* delegate) { 21 void PermissionPromptAndroid::SetDelegate(Delegate* delegate) {
21 delegate_ = delegate; 22 delegate_ = delegate;
22 } 23 }
23 24
24 void PermissionPromptAndroid::Show( 25 void PermissionPromptAndroid::Show(
25 const std::vector<PermissionRequest*>& requests, 26 const std::vector<PermissionRequest*>& requests,
26 const std::vector<bool>& values) { 27 const std::vector<bool>& values) {
28 // Grouped permission requests are not yet supported in dialogs.
29 // TODO(timloh): Handle grouped media permissions (camera + microphone).
30 if (requests.size() == 1) {
31 bool has_gesture =
32 requests[0]->GetGestureType() == PermissionRequestGestureType::GESTURE;
33 if (PermissionDialogDelegate::ShouldShowDialog(has_gesture)) {
34 requests_ = requests;
35 PermissionDialogDelegate::Create(web_contents_, this);
36 return;
37 }
38 }
39
27 InfoBarService* infobar_service = 40 InfoBarService* infobar_service =
28 InfoBarService::FromWebContents(web_contents_); 41 InfoBarService::FromWebContents(web_contents_);
29 if (!infobar_service) 42 if (!infobar_service)
30 return; 43 return;
31 44
32 requests_ = requests; 45 requests_ = requests;
33 GroupedPermissionInfoBarDelegate::Create(this, infobar_service, 46 GroupedPermissionInfoBarDelegate::Create(this, infobar_service,
34 requests[0]->GetOrigin()); 47 requests[0]->GetOrigin());
35 } 48 }
36 49
(...skipping 62 matching lines...) Expand 10 before | Expand all | Expand 10 after
99 size_t position) const { 112 size_t position) const {
100 DCHECK_LT(position, requests_.size()); 113 DCHECK_LT(position, requests_.size());
101 return requests_[position]->GetMessageTextFragment(); 114 return requests_[position]->GetMessageTextFragment();
102 } 115 }
103 116
104 // static 117 // static
105 std::unique_ptr<PermissionPrompt> PermissionPrompt::Create( 118 std::unique_ptr<PermissionPrompt> PermissionPrompt::Create(
106 content::WebContents* web_contents) { 119 content::WebContents* web_contents) {
107 return base::MakeUnique<PermissionPromptAndroid>(web_contents); 120 return base::MakeUnique<PermissionPromptAndroid>(web_contents);
108 } 121 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698