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

Unified Diff: chrome/browser/chrome_content_browser_client.cc

Issue 9570012: Implement Linux Media Stream Infobar (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: Fix Peter'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
Index: chrome/browser/chrome_content_browser_client.cc
diff --git a/chrome/browser/chrome_content_browser_client.cc b/chrome/browser/chrome_content_browser_client.cc
index 38f66d7a497ffa77f78cbde258634d0890622bd1..004528832fc6852c9e75f28ab1d9cbc828b75778 100644
--- a/chrome/browser/chrome_content_browser_client.cc
+++ b/chrome/browser/chrome_content_browser_client.cc
@@ -1114,7 +1114,7 @@ void ChromeContentBrowserClient::RequestMediaAccessPermission(
infobar_helper->GetInfoBarDelegateAt(i)->AsMediaStreamInfobarDelegate();
}
-#if defined(TOOLKIT_VIEWS)
+#if defined(TOOLKIT_VIEWS) || defined(OS_LINUX)
InfoBarDelegate* infobar = new MediaStreamInfoBarDelegate(infobar_helper,
request,
callback);
@@ -1122,8 +1122,8 @@ void ChromeContentBrowserClient::RequestMediaAccessPermission(
infobar_helper->ReplaceInfoBar(old_infobar, infobar);
else
infobar_helper->AddInfoBar(infobar);
-#elif defined(OS_LINUX) || defined(OS_MACOSX)
- // TODO(macourteau): UI is not implemented yet for Linux and OS X. Fallback to
+#elif defined(OS_MACOSX)
+ // TODO(macourteau): UI is not implemented yet for OS X. Fallback to
// the default behaviour and allow access to the first device of each
// requested type.
content::MediaStreamDevices devices;
@@ -1134,7 +1134,7 @@ void ChromeContentBrowserClient::RequestMediaAccessPermission(
}
callback.Run(devices);
-#endif // TOOLKIT_VIEWS
+#endif // TOOLKIT_VIEWS || OS_LINUX
}
void ChromeContentBrowserClient::RequestDesktopNotificationPermission(

Powered by Google App Engine
This is Rietveld 408576698