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

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

Issue 2897223002: Fix message text for modal prompts when PermissionRequestManager enabled (Closed)
Patch Set: address comments Created 3 years, 6 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_dialog_delegate.h"
(...skipping 85 matching lines...) Expand 10 before | Expand all | Expand 10 after
96 DCHECK_LT(position, requests.size()); 96 DCHECK_LT(position, requests.size());
97 return requests[position]->GetContentSettingsType(); 97 return requests[position]->GetContentSettingsType();
98 } 98 }
99 99
100 int PermissionPromptAndroid::GetIconIdForPermission(size_t position) const { 100 int PermissionPromptAndroid::GetIconIdForPermission(size_t position) const {
101 const std::vector<PermissionRequest*>& requests = delegate_->Requests(); 101 const std::vector<PermissionRequest*>& requests = delegate_->Requests();
102 DCHECK_LT(position, requests.size()); 102 DCHECK_LT(position, requests.size());
103 return requests[position]->GetIconId(); 103 return requests[position]->GetIconId();
104 } 104 }
105 105
106 base::string16 PermissionPromptAndroid::GetMessageText(size_t position) const {
107 const std::vector<PermissionRequest*>& requests = delegate_->Requests();
108 DCHECK_LT(position, requests.size());
109 return requests[position]->GetMessageText();
110 }
111
106 base::string16 PermissionPromptAndroid::GetMessageTextFragment( 112 base::string16 PermissionPromptAndroid::GetMessageTextFragment(
107 size_t position) const { 113 size_t position) const {
108 const std::vector<PermissionRequest*>& requests = delegate_->Requests(); 114 const std::vector<PermissionRequest*>& requests = delegate_->Requests();
109 DCHECK_LT(position, requests.size()); 115 DCHECK_LT(position, requests.size());
110 return requests[position]->GetMessageTextFragment(); 116 return requests[position]->GetMessageTextFragment();
111 } 117 }
112 118
113 // static 119 // static
114 std::unique_ptr<PermissionPrompt> PermissionPrompt::Create( 120 std::unique_ptr<PermissionPrompt> PermissionPrompt::Create(
115 content::WebContents* web_contents) { 121 content::WebContents* web_contents) {
116 return base::MakeUnique<PermissionPromptAndroid>(web_contents); 122 return base::MakeUnique<PermissionPromptAndroid>(web_contents);
117 } 123 }
OLDNEW
« no previous file with comments | « chrome/browser/permissions/permission_prompt_android.h ('k') | chrome/browser/permissions/permission_request.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698