Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1932)

Unified Diff: chrome/browser/media/media_stream_devices_controller.h

Issue 12092045: Revert 179093 (Closed) Base URL: svn://svn.chromium.org/chrome/branches/1397/src/
Patch Set: Created 7 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: chrome/browser/media/media_stream_devices_controller.h
===================================================================
--- chrome/browser/media/media_stream_devices_controller.h (revision 179367)
+++ chrome/browser/media/media_stream_devices_controller.h (working copy)
@@ -11,12 +11,10 @@
class PrefServiceSyncable;
class Profile;
-class TabSpecificContentSettings;
class MediaStreamDevicesController {
public:
MediaStreamDevicesController(Profile* profile,
- TabSpecificContentSettings* content_settings,
const content::MediaStreamRequest& request,
const content::MediaResponseCallback& callback);
@@ -73,13 +71,6 @@
// The owner of this class needs to make sure it does not outlive the profile.
Profile* profile_;
- // Weak pointer to the tab specific content settings of the tab for which the
- // MediaStreamDevicesController was created. The tab specific content
- // settings are associated with a the web contents of the tab. The
- // MediaStreamDeviceController must not outlive the web contents for which it
- // was created.
- TabSpecificContentSettings* content_settings_;
-
// The original request for access to devices.
const content::MediaStreamRequest request_;

Powered by Google App Engine
This is Rietveld 408576698