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

Side by Side Diff: content/browser/renderer_host/media/media_stream_manager.h

Issue 248113003: Fix for closing the desktop sharing notification bar when the shared window is closed (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: address comments and add a test Created 6 years, 8 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 unified diff | Download patch
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 // MediaStreamManager is used to open/enumerate media capture devices (video 5 // MediaStreamManager is used to open/enumerate media capture devices (video
6 // supported now). Call flow: 6 // supported now). Call flow:
7 // 1. GenerateStream is called when a render process wants to use a capture 7 // 1. GenerateStream is called when a render process wants to use a capture
8 // device. 8 // device.
9 // 2. MediaStreamManager will ask MediaStreamUIController for permission to 9 // 2. MediaStreamManager will ask MediaStreamUIController for permission to
10 // use devices and for which device to use. 10 // use devices and for which device to use.
(...skipping 138 matching lines...) Expand 10 before | Expand all | Expand 10 after
149 // notifications about device changes. 149 // notifications about device changes.
150 void EnsureDeviceMonitorStarted(); 150 void EnsureDeviceMonitorStarted();
151 151
152 // Implements MediaStreamProviderListener. 152 // Implements MediaStreamProviderListener.
153 virtual void Opened(MediaStreamType stream_type, 153 virtual void Opened(MediaStreamType stream_type,
154 int capture_session_id) OVERRIDE; 154 int capture_session_id) OVERRIDE;
155 virtual void Closed(MediaStreamType stream_type, 155 virtual void Closed(MediaStreamType stream_type,
156 int capture_session_id) OVERRIDE; 156 int capture_session_id) OVERRIDE;
157 virtual void DevicesEnumerated(MediaStreamType stream_type, 157 virtual void DevicesEnumerated(MediaStreamType stream_type,
158 const StreamDeviceInfoArray& devices) OVERRIDE; 158 const StreamDeviceInfoArray& devices) OVERRIDE;
159 virtual void Aborted(MediaStreamType stream_type,
160 int capture_session_id) OVERRIDE;
perkj_chrome 2014/04/25 14:36:45 nit: indentation
159 161
160 // Implements base::SystemMonitor::DevicesChangedObserver. 162 // Implements base::SystemMonitor::DevicesChangedObserver.
161 virtual void OnDevicesChanged( 163 virtual void OnDevicesChanged(
162 base::SystemMonitor::DeviceType device_type) OVERRIDE; 164 base::SystemMonitor::DeviceType device_type) OVERRIDE;
163 165
164 // Used by unit test to make sure fake devices are used instead of a real 166 // Used by unit test to make sure fake devices are used instead of a real
165 // devices, which is needed for server based testing or certain tests (which 167 // devices, which is needed for server based testing or certain tests (which
166 // can pass --use-fake-device-for-media-stream). 168 // can pass --use-fake-device-for-media-stream).
167 void UseFakeDevice(); 169 void UseFakeDevice();
168 170
(...skipping 212 matching lines...) Expand 10 before | Expand all | Expand 10 after
381 383
382 bool use_fake_ui_; 384 bool use_fake_ui_;
383 scoped_ptr<FakeMediaStreamUIProxy> fake_ui_; 385 scoped_ptr<FakeMediaStreamUIProxy> fake_ui_;
384 386
385 DISALLOW_COPY_AND_ASSIGN(MediaStreamManager); 387 DISALLOW_COPY_AND_ASSIGN(MediaStreamManager);
386 }; 388 };
387 389
388 } // namespace content 390 } // namespace content
389 391
390 #endif // CONTENT_BROWSER_RENDERER_HOST_MEDIA_MEDIA_STREAM_MANAGER_H_ 392 #endif // CONTENT_BROWSER_RENDERER_HOST_MEDIA_MEDIA_STREAM_MANAGER_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698