Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(7473)

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: Fix tfarina's comments Created 8 years, 9 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
« no previous file with comments | « chrome/browser/ui/gtk/infobars/media_stream_infobar_gtk.cc ('k') | chrome/chrome_browser.gypi » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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
« no previous file with comments | « chrome/browser/ui/gtk/infobars/media_stream_infobar_gtk.cc ('k') | chrome/chrome_browser.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698