Add an location bar icon and a content settings bubble for media settings.

chrome/browser/ui/media_stream_infobar_delegate.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/ui/media_stream_infobar_delegate.h"
 
 #include "base/logging.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/api/infobars/infobar_service.h"
+#include "chrome/browser/content_settings/tab_specific_content_settings.h"
 #include "chrome/browser/google/google_util.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/common/url_constants.h"
 #include "content/public/browser/web_contents.h"
 #include "googleurl/src/gurl.h"
 #include "grit/generated_resources.h"
 #include "grit/theme_resources.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/resource/resource_bundle.h"
 
 MediaStreamInfoBarDelegate::~MediaStreamInfoBarDelegate() {}
 
 // static
 bool MediaStreamInfoBarDelegate::Create(
     content::WebContents* web_contents,
     const content::MediaStreamRequest& request,
     const content::MediaResponseCallback& callback) {
   Profile* profile =
       Profile::FromBrowserContext(web_contents->GetBrowserContext());
+  TabSpecificContentSettings* content_settings =
+      TabSpecificContentSettings::FromWebContents(web_contents);
 
   scoped_ptr<MediaStreamDevicesController> controller(
-      new MediaStreamDevicesController(profile, request, callback));
+      new MediaStreamDevicesController(profile, content_settings,
+                                       request, callback));
   if (!controller->DismissInfoBarAndTakeActionOnSettings()) {

[Bernhard Bauer, 2013/01/22 14:59:08]

Ooh, would you mind doing some cleanup and reversing this condition to
early-return if we don't need to show the infobar?

[markusheintz_, 2013/01/23 10:42:30]

Oh I didn't notice! Thanks for pointing this out. 
Done. Also removed some empty lines.

     InfoBarService* infobar_service =
         InfoBarService::FromWebContents(web_contents);
     InfoBarDelegate* old_infobar = NULL;
     for (size_t i = 0; i < infobar_service->GetInfoBarCount(); ++i) {
       old_infobar = infobar_service->GetInfoBarDelegateAt(i)->
           AsMediaStreamInfoBarDelegate();
       if (old_infobar)
         break;
     }
 
@@ skipping 74 matching lines @@
 }
 
 MediaStreamInfoBarDelegate::MediaStreamInfoBarDelegate(
     InfoBarService* infobar_service,
     MediaStreamDevicesController* controller)
     : ConfirmInfoBarDelegate(infobar_service),
       controller_(controller) {
   DCHECK(controller_.get());
   DCHECK(controller_->has_audio() || controller_->has_video());
 }