chrome/browser/permissions/permission_update_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/permission_update_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/permissions/permission_request_impl.cc ('K') | « chrome/browser/permissions/permission_request_manager.cc ('k') | chrome/browser/ui/cocoa/website_settings/permission_bubble_controller.mm » ('j') | ui/gfx/vector_icons/microphone.icon » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/permissions/permission_update_infobar_delegate_android.cc

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

index 6d796e9487790e97e5f92f10d95789c4cb9cba49..47fb590c393f5de48f6fa46799597e5cdd370020 100644

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

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

@@ -9,10 +9,10 @@

#include "base/android/jni_array.h"

#include "base/callback_helpers.h"

#include "chrome/browser/android/preferences/pref_service_bridge.h"

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

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

#include "chrome/grit/chromium_strings.h"

#include "chrome/grit/generated_resources.h"

-#include "chrome/grit/theme_resources.h"

#include "components/infobars/core/infobar.h"

#include "content/public/browser/android/content_view_core.h"

#include "content/public/browser/web_contents.h"

@@ -154,7 +154,7 @@ PermissionUpdateInfoBarDelegate::GetIdentifier() const {

}

int PermissionUpdateInfoBarDelegate::GetIconId() const {

- return IDR_INFOBAR_WARNING;

+ return IDR_ANDROID_INFOBAR_WARNING;

}

base::string16 PermissionUpdateInfoBarDelegate::GetMessageText() const {