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

Side by Side Diff: chrome/browser/permissions/permission_prompt_android.cc

Issue 2868783002: Move requests from Show() argument to PermissionPrompt::Delegate (Closed)
Patch Set: tweak comment 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 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_request.h" 10 #include "chrome/browser/permissions/permission_request.h"
11 11
12 PermissionPromptAndroid::PermissionPromptAndroid( 12 PermissionPromptAndroid::PermissionPromptAndroid(
13 content::WebContents* web_contents) 13 content::WebContents* web_contents)
14 : web_contents_(web_contents), delegate_(nullptr) { 14 : web_contents_(web_contents), delegate_(nullptr) {
15 DCHECK(web_contents); 15 DCHECK(web_contents);
16 } 16 }
17 17
18 PermissionPromptAndroid::~PermissionPromptAndroid() {} 18 PermissionPromptAndroid::~PermissionPromptAndroid() {}
19 19
20 void PermissionPromptAndroid::SetDelegate(Delegate* delegate) { 20 void PermissionPromptAndroid::SetDelegate(Delegate* delegate) {
21 delegate_ = delegate; 21 delegate_ = delegate;
22 } 22 }
23 23
24 void PermissionPromptAndroid::Show( 24 void PermissionPromptAndroid::Show() {
25 const std::vector<PermissionRequest*>& requests,
26 const std::vector<bool>& values) {
27 InfoBarService* infobar_service = 25 InfoBarService* infobar_service =
28 InfoBarService::FromWebContents(web_contents_); 26 InfoBarService::FromWebContents(web_contents_);
29 if (!infobar_service) 27 if (!infobar_service)
30 return; 28 return;
31 29
32 requests_ = requests; 30 GroupedPermissionInfoBarDelegate::Create(
33 GroupedPermissionInfoBarDelegate::Create(this, infobar_service, 31 this, infobar_service, delegate_->Requests()[0]->GetOrigin());
34 requests[0]->GetOrigin());
35 } 32 }
36 33
37 bool PermissionPromptAndroid::CanAcceptRequestUpdate() { 34 bool PermissionPromptAndroid::CanAcceptRequestUpdate() {
38 return false; 35 return false;
39 } 36 }
40 37
41 bool PermissionPromptAndroid::HidesAutomatically() { 38 bool PermissionPromptAndroid::HidesAutomatically() {
42 return true; 39 return true;
43 } 40 }
44 41
45 void PermissionPromptAndroid::Hide() { 42 void PermissionPromptAndroid::Hide() {
46 // Hide() is only called if HidesAutomatically() returns false or 43 // Hide() is only called if HidesAutomatically() returns false or
47 // CanAcceptRequestUpdate() return true. 44 // CanAcceptRequestUpdate() return true.
48 NOTREACHED(); 45 NOTREACHED();
49 } 46 }
50 47
51 void PermissionPromptAndroid::UpdateAnchorPosition() { 48 void PermissionPromptAndroid::UpdateAnchorPosition() {
52 NOTREACHED() << "UpdateAnchorPosition is not implemented"; 49 NOTREACHED() << "UpdateAnchorPosition is not implemented";
53 } 50 }
54 51
55 gfx::NativeWindow PermissionPromptAndroid::GetNativeWindow() { 52 gfx::NativeWindow PermissionPromptAndroid::GetNativeWindow() {
56 NOTREACHED() << "GetNativeWindow is not implemented"; 53 NOTREACHED() << "GetNativeWindow is not implemented";
57 return nullptr; 54 return nullptr;
58 } 55 }
59 56
60 void PermissionPromptAndroid::Closing() { 57 void PermissionPromptAndroid::Closing() {
61 requests_.clear();
62 if (delegate_) 58 if (delegate_)
63 delegate_->Closing(); 59 delegate_->Closing();
64 } 60 }
65 61
66 void PermissionPromptAndroid::ToggleAccept(int index, bool value) { 62 void PermissionPromptAndroid::ToggleAccept(int index, bool value) {
67 if (delegate_) 63 if (delegate_)
68 delegate_->ToggleAccept(index, value); 64 delegate_->ToggleAccept(index, value);
69 } 65 }
70 66
71 void PermissionPromptAndroid::Accept() { 67 void PermissionPromptAndroid::Accept() {
72 requests_.clear();
73 if (delegate_) 68 if (delegate_)
74 delegate_->Accept(); 69 delegate_->Accept();
75 } 70 }
76 71
77 void PermissionPromptAndroid::Deny() { 72 void PermissionPromptAndroid::Deny() {
78 requests_.clear();
79 if (delegate_) 73 if (delegate_)
80 delegate_->Deny(); 74 delegate_->Deny();
81 } 75 }
82 76
77 size_t PermissionPromptAndroid::PermissionCount() const {
78 return delegate_->Requests().size();
79 }
80
83 ContentSettingsType PermissionPromptAndroid::GetContentSettingType( 81 ContentSettingsType PermissionPromptAndroid::GetContentSettingType(
84 size_t position) const { 82 size_t position) const {
85 DCHECK_LT(position, requests_.size()); 83 const std::vector<PermissionRequest*>& requests = delegate_->Requests();
86 return requests_[position]->GetContentSettingsType(); 84 DCHECK_LT(position, requests.size());
85 return requests[position]->GetContentSettingsType();
87 } 86 }
88 87
89 int PermissionPromptAndroid::GetIconIdForPermission(size_t position) const { 88 int PermissionPromptAndroid::GetIconIdForPermission(size_t position) const {
90 DCHECK_LT(position, requests_.size()); 89 const std::vector<PermissionRequest*>& requests = delegate_->Requests();
91 return requests_[position]->GetIconId(); 90 DCHECK_LT(position, requests.size());
91 return requests[position]->GetIconId();
92 } 92 }
93 93
94 base::string16 PermissionPromptAndroid::GetMessageTextFragment( 94 base::string16 PermissionPromptAndroid::GetMessageTextFragment(
95 size_t position) const { 95 size_t position) const {
96 DCHECK_LT(position, requests_.size()); 96 const std::vector<PermissionRequest*>& requests = delegate_->Requests();
97 return requests_[position]->GetMessageTextFragment(); 97 DCHECK_LT(position, requests.size());
98 return requests[position]->GetMessageTextFragment();
98 } 99 }
99 100
100 // static 101 // static
101 std::unique_ptr<PermissionPrompt> PermissionPrompt::Create( 102 std::unique_ptr<PermissionPrompt> PermissionPrompt::Create(
102 content::WebContents* web_contents) { 103 content::WebContents* web_contents) {
103 return base::MakeUnique<PermissionPromptAndroid>(web_contents); 104 return base::MakeUnique<PermissionPromptAndroid>(web_contents);
104 } 105 }
OLDNEW
« no previous file with comments | « chrome/browser/permissions/permission_prompt_android.h ('k') | chrome/browser/permissions/permission_request_manager.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698