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

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

Issue 2897223002: Fix message text for modal prompts when PermissionRequestManager enabled (Closed)
Patch Set: address comments 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_request_impl.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_request_manager.cc
diff --git a/chrome/browser/permissions/permission_request_manager.cc b/chrome/browser/permissions/permission_request_manager.cc
index 51fe1baeb4634a09154be5a89f38abc737956e32..61346ec93919f6a08f3d253d4c1f4fa22c382d44 100644
--- a/chrome/browser/permissions/permission_request_manager.cc
+++ b/chrome/browser/permissions/permission_request_manager.cc
@@ -26,11 +26,18 @@ class CancelledRequest : public PermissionRequest {
public:
explicit CancelledRequest(PermissionRequest* cancelled)
: icon_(cancelled->GetIconId()),
+#if defined(OS_ANDROID)
+ message_(cancelled->GetMessageText()),
+#endif
message_fragment_(cancelled->GetMessageTextFragment()),
- origin_(cancelled->GetOrigin()) {}
+ origin_(cancelled->GetOrigin()) {
+ }
~CancelledRequest() override {}
IconId GetIconId() const override { return icon_; }
+#if defined(OS_ANDROID)
+ base::string16 GetMessageText() const override { return message_; }
+#endif
base::string16 GetMessageTextFragment() const override {
return message_fragment_;
}
@@ -45,6 +52,9 @@ class CancelledRequest : public PermissionRequest {
private:
IconId icon_;
+#if defined(OS_ANDROID)
+ base::string16 message_;
+#endif
base::string16 message_fragment_;
GURL origin_;
};
« no previous file with comments | « chrome/browser/permissions/permission_request_impl.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698