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

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: 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:
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 1e1d02e0ab65b202ce90c5b6ba9107d7febcd8ac..31f3567d4e7927f0ce7765833e65a75a67f928c1 100644
--- a/chrome/browser/chrome_content_browser_client.cc
+++ b/chrome/browser/chrome_content_browser_client.cc
@@ -1100,7 +1100,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);
@@ -1108,8 +1108,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;

Powered by Google App Engine
This is Rietveld 408576698