Index: chrome/browser/ui/media_stream_infobar_delegate.cc |
diff --git a/chrome/browser/ui/media_stream_infobar_delegate.cc b/chrome/browser/ui/media_stream_infobar_delegate.cc |
index e7f917143bb5306bbf434c94a57e83d128c701ed..cda703c2ed3511fb59ed152d41f32a9dc34b1034 100644 |
--- a/chrome/browser/ui/media_stream_infobar_delegate.cc |
+++ b/chrome/browser/ui/media_stream_infobar_delegate.cc |
@@ -7,6 +7,7 @@ |
#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" |
@@ -26,9 +27,12 @@ bool MediaStreamInfoBarDelegate::Create( |
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 reversi
markusheintz_
2013/01/23 10:42:30
Oh I didn't notice! Thanks for pointing this out.
|
InfoBarService* infobar_service = |
InfoBarService::FromWebContents(web_contents); |