Implement Linux Media Stream Infobar

chrome/browser/chrome_content_browser_client.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/chrome_content_browser_client.h"
 
 #include <set>
 #include <utility>
 #include <vector>
 
@@ skipping 1082 matching lines @@
       TabContentsWrapper::GetCurrentWrapperForContents(contents);
   DCHECK(tab);
 
   InfoBarTabHelper* infobar_helper = tab->infobar_tab_helper();
   InfoBarDelegate* old_infobar = NULL;
   for (size_t i = 0; i < infobar_helper->infobar_count() && !old_infobar; ++i) {
     old_infobar =
         infobar_helper->GetInfoBarDelegateAt(i)->AsMediaStreamInfobarDelegate();
   }
 
-#if defined(TOOLKIT_VIEWS)
+#if defined(TOOLKIT_VIEWS) || defined(OS_LINUX)
   InfoBarDelegate* infobar = new MediaStreamInfoBarDelegate(infobar_helper,
                                                             request,
                                                             callback);
   if (old_infobar)
     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;
   for (content::MediaStreamDeviceMap::const_iterator it =
        request->devices.begin(); it != request->devices.end(); ++it) {
     devices.push_back(*it->second.begin());
   }
 
   callback.Run(devices);
 #endif  // TOOLKIT_VIEWS

[macourteau, 2012/03/01 15:32:29]

Please also update this comment (i.e. "TOOLKIT_VIEWS || OS_LINUX").

 }
 
 void ChromeContentBrowserClient::RequestDesktopNotificationPermission(
     const GURL& source_origin,
     int callback_context,
     int render_process_id,
     int render_view_id) {
   RenderViewHost* rvh = RenderViewHost::FromID(
       render_process_id, render_view_id);
   if (!rvh) {
@@ skipping 385 matching lines @@
 #if defined(USE_NSS)
 crypto::CryptoModuleBlockingPasswordDelegate*
     ChromeContentBrowserClient::GetCryptoPasswordDelegate(
         const GURL& url) {
   return browser::NewCryptoModuleBlockingDialogDelegate(
       browser::kCryptoModulePasswordKeygen, url.host());
 }
 #endif
 
 }  // namespace chrome