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

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

Issue 2917343002: Run PermissionRequestManager tests on Android (Closed)
Patch Set: 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/browser/permissions/mock_permission_request.h ('k') | chrome/test/BUILD.gn » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/permissions/mock_permission_request.cc
diff --git a/chrome/browser/permissions/mock_permission_request.cc b/chrome/browser/permissions/mock_permission_request.cc
index ae217961b86ed5d139127ab0737aa2d2458c702c..c7e04212f02b6792af273c088e9eedb8437a465d 100644
--- a/chrome/browser/permissions/mock_permission_request.cc
+++ b/chrome/browser/permissions/mock_permission_request.cc
@@ -6,7 +6,12 @@
#include "base/strings/string16.h"
#include "base/strings/utf_string_conversions.h"
+
+#if defined(OS_ANDROID)
+#include "chrome/browser/android/android_theme_resources.h"
+#else
#include "ui/vector_icons/vector_icons.h"
+#endif
MockPermissionRequest::MockPermissionRequest()
: MockPermissionRequest("test",
@@ -61,8 +66,18 @@ MockPermissionRequest::~MockPermissionRequest() {}
PermissionRequest::IconId MockPermissionRequest::GetIconId() const {
// Use a valid icon ID to support UI tests.
+#if defined(OS_ANDROID)
+ return IDR_ANDROID_INFOBAR_WARNING;
+#else
return ui::kWarningIcon;
+#endif
+}
+
+#if defined(OS_ANDROID)
+base::string16 MockPermissionRequest::GetMessageText() const {
+ return text_;
}
+#endif
base::string16 MockPermissionRequest::GetMessageTextFragment() const {
return text_;
« no previous file with comments | « chrome/browser/permissions/mock_permission_request.h ('k') | chrome/test/BUILD.gn » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698