chrome/browser/media/webrtc/screen_capture_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/media/webrtc/screen_capture_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/media_stream_devices_controller.cc ('k') | chrome/browser/permissions/grouped_permission_infobar_delegate_android.cc » ('j') | chrome/browser/permissions/permission_request_impl.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/media/webrtc/screen_capture_infobar_delegate_android.cc

diff --git a/chrome/browser/media/webrtc/screen_capture_infobar_delegate_android.cc b/chrome/browser/media/webrtc/screen_capture_infobar_delegate_android.cc

index bdbc0be12e1b26eb9c7a5d6dc42c82cc8e892666..2d9e4ae12fe96745b8a23bcce69871e2cc283290 100644

--- a/chrome/browser/media/webrtc/screen_capture_infobar_delegate_android.cc

+++ b/chrome/browser/media/webrtc/screen_capture_infobar_delegate_android.cc

@@ -5,12 +5,12 @@

#include "chrome/browser/media/webrtc/screen_capture_infobar_delegate_android.h"

#include "base/callback_helpers.h"

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

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

#include "chrome/browser/media/webrtc/desktop_streams_registry.h"

#include "chrome/browser/media/webrtc/media_capture_devices_dispatcher.h"

#include "chrome/browser/media/webrtc/media_stream_capture_indicator.h"

#include "chrome/grit/generated_resources.h"

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

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

#include "components/url_formatter/elide_url.h"

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

@@ -59,7 +59,7 @@ base::string16 ScreenCaptureInfoBarDelegateAndroid::GetMessageText() const {

}

int ScreenCaptureInfoBarDelegateAndroid::GetIconId() const {

- return IDR_INFOBAR_MEDIA_STREAM_SCREEN;

+ return IDR_ANDROID_INFOBAR_MEDIA_STREAM_SCREEN;

}

base::string16 ScreenCaptureInfoBarDelegateAndroid::GetButtonLabel(