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

Side by Side Diff: chrome/browser/chrome_quota_permission_context.cc

Issue 2897223002: Fix message text for modal prompts when PermissionRequestManager enabled (Closed)
Patch Set: add mic/cam in switch 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 (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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/chrome_quota_permission_context.h" 5 #include "chrome/browser/chrome_quota_permission_context.h"
6 6
7 #include <stdint.h> 7 #include <stdint.h>
8 8
9 #include <string> 9 #include <string>
10 10
(...skipping 32 matching lines...) Expand 10 before | Expand all | Expand 10 after
43 const int64_t kRequestLargeQuotaThreshold = 5 * 1024 * 1024; 43 const int64_t kRequestLargeQuotaThreshold = 5 * 1024 * 1024;
44 #endif 44 #endif
45 45
46 // QuotaPermissionRequest --------------------------------------------- 46 // QuotaPermissionRequest ---------------------------------------------
47 47
48 class QuotaPermissionRequest : public PermissionRequest { 48 class QuotaPermissionRequest : public PermissionRequest {
49 public: 49 public:
50 QuotaPermissionRequest( 50 QuotaPermissionRequest(
51 ChromeQuotaPermissionContext* context, 51 ChromeQuotaPermissionContext* context,
52 const GURL& origin_url, 52 const GURL& origin_url,
53 int64_t requested_quota,
53 const content::QuotaPermissionContext::PermissionCallback& callback); 54 const content::QuotaPermissionContext::PermissionCallback& callback);
54 55
55 ~QuotaPermissionRequest() override; 56 ~QuotaPermissionRequest() override;
56 57
57 private: 58 private:
58 // PermissionRequest: 59 // PermissionRequest:
59 IconId GetIconId() const override; 60 IconId GetIconId() const override;
61 base::string16 GetMessageText() const override;
60 base::string16 GetMessageTextFragment() const override; 62 base::string16 GetMessageTextFragment() const override;
61 GURL GetOrigin() const override; 63 GURL GetOrigin() const override;
62 void PermissionGranted() override; 64 void PermissionGranted() override;
63 void PermissionDenied() override; 65 void PermissionDenied() override;
64 void Cancelled() override; 66 void Cancelled() override;
65 void RequestFinished() override; 67 void RequestFinished() override;
66 PermissionRequestType GetPermissionRequestType() const override; 68 PermissionRequestType GetPermissionRequestType() const override;
67 69
68 scoped_refptr<ChromeQuotaPermissionContext> context_; 70 scoped_refptr<ChromeQuotaPermissionContext> context_;
69 GURL origin_url_; 71 GURL origin_url_;
72 int64_t requested_quota_;
70 content::QuotaPermissionContext::PermissionCallback callback_; 73 content::QuotaPermissionContext::PermissionCallback callback_;
71 74
72 DISALLOW_COPY_AND_ASSIGN(QuotaPermissionRequest); 75 DISALLOW_COPY_AND_ASSIGN(QuotaPermissionRequest);
73 }; 76 };
74 77
75 QuotaPermissionRequest::QuotaPermissionRequest( 78 QuotaPermissionRequest::QuotaPermissionRequest(
76 ChromeQuotaPermissionContext* context, 79 ChromeQuotaPermissionContext* context,
77 const GURL& origin_url, 80 const GURL& origin_url,
81 int64_t requested_quota,
78 const content::QuotaPermissionContext::PermissionCallback& callback) 82 const content::QuotaPermissionContext::PermissionCallback& callback)
79 : context_(context), 83 : context_(context),
80 origin_url_(origin_url), 84 origin_url_(origin_url),
85 requested_quota_(requested_quota),
81 callback_(callback) {} 86 callback_(callback) {}
82 87
83 QuotaPermissionRequest::~QuotaPermissionRequest() {} 88 QuotaPermissionRequest::~QuotaPermissionRequest() {}
84 89
85 PermissionRequest::IconId QuotaPermissionRequest::GetIconId() const { 90 PermissionRequest::IconId QuotaPermissionRequest::GetIconId() const {
86 // TODO(gbillock): get the proper image here 91 // TODO(gbillock): get the proper image here
87 #if defined(OS_ANDROID) 92 #if defined(OS_ANDROID)
88 return IDR_ANDROID_INFOBAR_WARNING; 93 return IDR_ANDROID_INFOBAR_WARNING;
89 #else 94 #else
90 return ui::kWarningIcon; 95 return ui::kWarningIcon;
91 #endif 96 #endif
92 } 97 }
93 98
99 base::string16 QuotaPermissionRequest::GetMessageText() const {
100 #if !defined(OS_ANDROID)
101 NOTREACHED();
102 #endif
103 // If the site requested larger quota than this threshold, show a different
104 // message to the user.
105 return l10n_util::GetStringFUTF16(
106 (requested_quota_ > kRequestLargeQuotaThreshold
107 ? IDS_REQUEST_LARGE_QUOTA_INFOBAR_QUESTION
108 : IDS_REQUEST_QUOTA_INFOBAR_QUESTION),
109 url_formatter::FormatUrlForSecurityDisplay(origin_url_));
110 }
111
94 base::string16 QuotaPermissionRequest::GetMessageTextFragment() const { 112 base::string16 QuotaPermissionRequest::GetMessageTextFragment() const {
95 return l10n_util::GetStringUTF16(IDS_REQUEST_QUOTA_PERMISSION_FRAGMENT); 113 return l10n_util::GetStringUTF16(IDS_REQUEST_QUOTA_PERMISSION_FRAGMENT);
96 } 114 }
97 115
98 GURL QuotaPermissionRequest::GetOrigin() const { 116 GURL QuotaPermissionRequest::GetOrigin() const {
99 return origin_url_; 117 return origin_url_;
100 } 118 }
101 119
102 void QuotaPermissionRequest::PermissionGranted() { 120 void QuotaPermissionRequest::PermissionGranted() {
103 context_->DispatchCallbackOnIOThread( 121 context_->DispatchCallbackOnIOThread(
(...skipping 157 matching lines...) Expand 10 before | Expand all | Expand 10 after
261 LOG(WARNING) << "Attempt to request quota tabless renderer: " 279 LOG(WARNING) << "Attempt to request quota tabless renderer: "
262 << render_process_id << "," << params.render_frame_id; 280 << render_process_id << "," << params.render_frame_id;
263 DispatchCallbackOnIOThread(callback, QUOTA_PERMISSION_RESPONSE_CANCELLED); 281 DispatchCallbackOnIOThread(callback, QUOTA_PERMISSION_RESPONSE_CANCELLED);
264 return; 282 return;
265 } 283 }
266 284
267 if (PermissionRequestManager::IsEnabled()) { 285 if (PermissionRequestManager::IsEnabled()) {
268 PermissionRequestManager* permission_request_manager = 286 PermissionRequestManager* permission_request_manager =
269 PermissionRequestManager::FromWebContents(web_contents); 287 PermissionRequestManager::FromWebContents(web_contents);
270 if (permission_request_manager) { 288 if (permission_request_manager) {
271 permission_request_manager->AddRequest( 289 permission_request_manager->AddRequest(new QuotaPermissionRequest(
272 new QuotaPermissionRequest(this, params.origin_url, callback)); 290 this, params.origin_url, params.requested_size, callback));
273 return; 291 return;
274 } 292 }
275 #if defined(OS_ANDROID) 293 #if defined(OS_ANDROID)
276 } else { 294 } else {
277 InfoBarService* infobar_service = 295 InfoBarService* infobar_service =
278 InfoBarService::FromWebContents(web_contents); 296 InfoBarService::FromWebContents(web_contents);
279 if (infobar_service) { 297 if (infobar_service) {
280 RequestQuotaInfoBarDelegate::Create(infobar_service, this, 298 RequestQuotaInfoBarDelegate::Create(infobar_service, this,
281 params.origin_url, 299 params.origin_url,
282 params.requested_size, callback); 300 params.requested_size, callback);
(...skipping 19 matching lines...) Expand all
302 base::BindOnce( 320 base::BindOnce(
303 &ChromeQuotaPermissionContext::DispatchCallbackOnIOThread, this, 321 &ChromeQuotaPermissionContext::DispatchCallbackOnIOThread, this,
304 callback, response)); 322 callback, response));
305 return; 323 return;
306 } 324 }
307 325
308 callback.Run(response); 326 callback.Run(response);
309 } 327 }
310 328
311 ChromeQuotaPermissionContext::~ChromeQuotaPermissionContext() {} 329 ChromeQuotaPermissionContext::~ChromeQuotaPermissionContext() {}
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698