chrome/browser/permissions/grouped_permission_infobar_delegate_android.cc - Issue 2385063005: Make PermissionRequest::GetIconId return different types

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: chrome/browser/permissions/grouped_permission_infobar_delegate_android.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

« chrome/browser/custom_handlers/register_protocol_handler_permission_request.cc ('K') | « chrome/browser/media/webrtc/screen_capture_infobar_delegate_android.cc ('k') | chrome/browser/permissions/mock_permission_request.h » ('j') | chrome/browser/permissions/permission_request_impl.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/permissions/grouped_permission_infobar_delegate_android.cc

diff --git a/chrome/browser/permissions/grouped_permission_infobar_delegate_android.cc b/chrome/browser/permissions/grouped_permission_infobar_delegate_android.cc

index 2cbb3b018d28c282895dbc748e449e85bf55cfb8..93aec6f084770ada9e39fd91e2a3c51778df837e 100644

--- a/chrome/browser/permissions/grouped_permission_infobar_delegate_android.cc

+++ b/chrome/browser/permissions/grouped_permission_infobar_delegate_android.cc

@@ -5,6 +5,7 @@

#include "chrome/browser/permissions/grouped_permission_infobar_delegate_android.h"

#include "base/memory/ptr_util.h"

+#include "chrome/browser/android/android_theme_resources.h"

#include "chrome/browser/infobars/infobar_service.h"

#include "chrome/browser/permissions/permission_util.h"

#include "chrome/browser/ui/android/infobars/grouped_permission_infobar.h"

@@ -46,7 +47,7 @@ int GroupedPermissionInfoBarDelegate::GetIconIdForPermission(

if (type == CONTENT_SETTINGS_TYPE_MEDIASTREAM_CAMERA)

return IDR_INFOBAR_MEDIA_STREAM_CAMERA;

- return IDR_INFOBAR_WARNING;

+ return IDR_ANDROID_INFOBAR_WARNING;

}

base::string16 GroupedPermissionInfoBarDelegate::GetMessageTextFragment(