components/infobars/core/infobar_delegate.h - Issue 1392023004: Rename android only infobars

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: components/infobars/core/infobar_delegate.h

Issue 1392023004: Rename android only infobars (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: try again Created 5 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:

Index: components/infobars/core/infobar_delegate.h

diff --git a/components/infobars/core/infobar_delegate.h b/components/infobars/core/infobar_delegate.h

index 40b73a9a3f130e61f8c865fa91533152781c3e9a..bed797f461274d2990cb5e3fe4679f14cd21b819 100644

--- a/components/infobars/core/infobar_delegate.h

+++ b/components/infobars/core/infobar_delegate.h

@@ -12,7 +12,6 @@

class ConfirmInfoBarDelegate;

class HungRendererInfoBarDelegate;

class InsecureContentInfoBarDelegate;

-class MediaStreamInfoBarDelegate;

class NativeAppInfoBarDelegate;

class PermissionInfobarDelegate;

class PopupBlockedInfoBarDelegate;

@@ -22,6 +21,7 @@ class ThemeInstalledInfoBarDelegate;

class ThreeDAPIInfoBarDelegate;

#if defined(OS_ANDROID)

+class MediaStreamInfoBarDelegateAndroid;

class MediaThrottleInfoBarDelegate;

#endif

@@ -124,7 +124,6 @@ class InfoBarDelegate {

virtual ConfirmInfoBarDelegate* AsConfirmInfoBarDelegate();

virtual HungRendererInfoBarDelegate* AsHungRendererInfoBarDelegate();

virtual InsecureContentInfoBarDelegate* AsInsecureContentInfoBarDelegate();

- virtual MediaStreamInfoBarDelegate* AsMediaStreamInfoBarDelegate();

virtual NativeAppInfoBarDelegate* AsNativeAppInfoBarDelegate();

virtual PermissionInfobarDelegate* AsPermissionInfobarDelegate();

virtual PopupBlockedInfoBarDelegate* AsPopupBlockedInfoBarDelegate();

@@ -135,6 +134,8 @@ class InfoBarDelegate {

virtual ThreeDAPIInfoBarDelegate* AsThreeDAPIInfoBarDelegate();

virtual translate::TranslateInfoBarDelegate* AsTranslateInfoBarDelegate();

#if defined(OS_ANDROID)

+ virtual MediaStreamInfoBarDelegateAndroid*

+ AsMediaStreamInfoBarDelegateAndroid();

virtual MediaThrottleInfoBarDelegate* AsMediaThrottleInfoBarDelegate();

#endif