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

chrome/browser/media/media_stream_devices_controller.h

Index: chrome/browser/media/media_stream_devices_controller.h
diff --git a/chrome/browser/media/media_stream_devices_controller.h b/chrome/browser/media/media_stream_devices_controller.h
index 992288ba88e45e27d69a7b07fc36872869b0f2f8..e05403501e2064dab5dddd5418262f14505776be 100644
--- a/chrome/browser/media/media_stream_devices_controller.h
+++ b/chrome/browser/media/media_stream_devices_controller.h
@@ -11,10 +11,12 @@
 
 class PrefServiceSyncable;
 class Profile;
+class TabSpecificContentSettings;
 
 class MediaStreamDevicesController {
  public:
   MediaStreamDevicesController(Profile* profile,
+                               TabSpecificContentSettings* content_settings,
                                const content::MediaStreamRequest& request,
                                const content::MediaResponseCallback& callback);
 
@@ -71,6 +73,11 @@ class MediaStreamDevicesController {
   // The owner of this class needs to make sure it does not outlive the profile.
   Profile* profile_;
 
+  // The tab specific content settings of the tab for which the
+  // MediaStreamDevicesController was created. The MediaStreamDeviceController
+  // must not outlive the web contents for which it was created.
+  TabSpecificContentSettings* content_settings_;

[no longer working on chromium, 2013/01/23 11:48:06]

nit, add a comment to specify the owner ship of this member is weak

[markusheintz_, 2013/01/23 12:18:33]

Done.

+
   // The original request for access to devices.
   const content::MediaStreamRequest request_;