| 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;
|
|
|