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

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

Issue 2385063005: Make PermissionRequest::GetIconId return different types (Closed)
Patch Set: android Created 4 years, 2 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
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 8fdf865b2f72a9628b8ae8c39623515af03a9b5f..a224f48e149181d05fa3e2ce33660c5417dc0f83 100644
--- a/chrome/browser/permissions/mock_permission_request.cc
+++ b/chrome/browser/permissions/mock_permission_request.cc
@@ -7,6 +7,7 @@
#include "base/strings/string16.h"
#include "base/strings/utf_string_conversions.h"
#include "chrome/grit/theme_resources.h"
+#include "ui/gfx/vector_icons_public.h"
MockPermissionRequest::MockPermissionRequest()
: MockPermissionRequest("test",
@@ -59,9 +60,9 @@ MockPermissionRequest::MockPermissionRequest(
MockPermissionRequest::~MockPermissionRequest() {}
-int MockPermissionRequest::GetIconId() const {
+PermissionRequest::IconId MockPermissionRequest::GetIconId() const {
// Use a valid icon ID to support UI tests.
- return IDR_INFOBAR_MEDIA_STREAM_CAMERA;
+ return gfx::VectorIconId::WARNING;
}
base::string16 MockPermissionRequest::GetMessageTextFragment() const {

Powered by Google App Engine
This is Rietveld 408576698