chrome/browser/ui/media_stream_infobar_delegate.cc - Issue 9570012: Implement Linux Media Stream Infobar

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/ui/media_stream_infobar_delegate.cc

Issue 9570012: Implement Linux Media Stream Infobar (Closed) Base URL: http://git.chromium.org/chromium/src.git@master

Patch Set: Add a missing file Created 8 years, 10 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: chrome/browser/ui/media_stream_infobar_delegate.cc

diff --git a/chrome/browser/ui/media_stream_infobar_delegate.cc b/chrome/browser/ui/media_stream_infobar_delegate.cc

index ef7bab4ee6b854efde589e32308f3c8a3093c800..71af29c78c068be7c7e4a2d158ef759651efd9a9 100644

--- a/chrome/browser/ui/media_stream_infobar_delegate.cc

+++ b/chrome/browser/ui/media_stream_infobar_delegate.cc

@@ -111,12 +111,14 @@ void MediaStreamInfoBarDelegate::AddDeviceWithId(

// files.

#if !defined(TOOLKIT_VIEWS)

+#if !defined(OS_LINUX)

macourteau 2012/03/01 15:32:29 Please merge this with the above line: #if !define

// TODO(macourteau): This section is temporary, until the InfoBar is implemented

// on other platforms, to make sure everything compiles and links.

InfoBar* MediaStreamInfoBarDelegate::CreateInfoBar(InfoBarTabHelper* owner) {

DCHECK(owner);

return NULL;

}

+#endif // !OS_LINUX

macourteau 2012/03/01 15:32:29 Please merge with the line below: #endif // !TOOL

#endif // !TOOLKIT_VIEWS

void MediaStreamInfoBarDelegate::InfoBarDismissed() {