Chromium Code Reviews| 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..1c93d3e4ab7d2eb73bc9e4476ee22ab8ff21007c 100644 |
| --- a/chrome/browser/ui/media_stream_infobar_delegate.cc |
| +++ b/chrome/browser/ui/media_stream_infobar_delegate.cc |
| @@ -110,14 +110,14 @@ void MediaStreamInfoBarDelegate::AddDeviceWithId( |
| // MediaStreamInfoBarDelegate::CreateInfoBar is implemented in platform-specific |
| // files. |
| -#if !defined(TOOLKIT_VIEWS) |
| +#if !defined(TOOLKIT_VIEWS) && !defined(OS_LINUX) |
|
Peter Kasting
2012/03/08 21:00:11
Maybe this should become #if defined(OS_MAC)?
|
| // 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 // !TOOLKIT_VIEWS |
| +#endif // !TOOLKIT_VIEWS && !OS_LINUX |
| void MediaStreamInfoBarDelegate::InfoBarDismissed() { |
| // Deny the request if the infobar was closed with the 'x' button, since |