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: 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..8786a151b99da2afec428f5873c15dc5689f666c 100644

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

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

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

#include "base/logging.h"

#include "chrome/browser/ui/media_stream_infobar_delegate.h"

+#include "chrome/browser/ui/gtk/infobars/media_stream_infobar_gtk.h"

macourteau 2012/03/01 14:06:23 Please don't include GTK headers here (see comment

#include "content/public/common/media_stream_request.h"

#include "grit/theme_resources_standard.h"

#include "ui/base/resource/resource_bundle.h"

@@ -115,6 +116,10 @@ void MediaStreamInfoBarDelegate::AddDeviceWithId(

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

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

DCHECK(owner);

+#if defined(OS_LINUX)

macourteau 2012/03/01 14:06:23 Please remove this chunk of code (see my comment a

+ MediaStreamInfoBarGtk* infobar_gtk = new MediaStreamInfoBarGtk(owner, this);

+ return infobar_gtk;

+#endif // OS_LINUX

return NULL;

}

#endif // !TOOLKIT_VIEWS