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

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

Issue 12843009: Replace screen capture confirmation infobar with a message box. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years, 9 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_capture_devices_dispatcher.h
diff --git a/chrome/browser/media/media_capture_devices_dispatcher.h b/chrome/browser/media/media_capture_devices_dispatcher.h
index 4acc58df390538f1166250dadba548a45c6d8405..84c86cd4fb38ca7dbcc0a076218edd2b8519b8f4 100644
--- a/chrome/browser/media/media_capture_devices_dispatcher.h
+++ b/chrome/browser/media/media_capture_devices_dispatcher.h
@@ -9,7 +9,9 @@
#include "base/memory/scoped_ptr.h"
#include "base/memory/singleton.h"
#include "base/observer_list.h"
+#include "chrome/browser/ui/screen_capture_confirmation_ui.h"
#include "content/public/browser/media_observer.h"
+#include "content/public/browser/web_contents_delegate.h"
#include "content/public/common/media_stream_request.h"
class AudioStreamIndicator;
@@ -56,6 +58,11 @@ class MediaCaptureDevicesDispatcher : public content::MediaObserver {
const content::MediaStreamDevices& GetAudioCaptureDevices();
const content::MediaStreamDevices& GetVideoCaptureDevices();
+ void RequestAccess(
+ content::WebContents* web_contents,
+ const content::MediaStreamRequest& request,
+ const content::MediaResponseCallback& callback);
+
// Helper to get the default devices which can be used by the media request,
// if the return list is empty, it means there is no available device on the
// OS.
@@ -117,6 +124,11 @@ class MediaCaptureDevicesDispatcher : public content::MediaObserver {
const content::MediaStreamDevice& device,
content::MediaRequestState state);
+ // Callback for ScreenCaptureConfirmationUI.
+ void OnScreenCaptureConfirmationResult(
+ const content::MediaResponseCallback& callback,
+ ScreenCaptureConfirmationUI::Result result);
+
// A list of cached audio capture devices.
content::MediaStreamDevices audio_devices_;
@@ -133,6 +145,8 @@ class MediaCaptureDevicesDispatcher : public content::MediaObserver {
scoped_refptr<MediaStreamCaptureIndicator> media_stream_capture_indicator_;
scoped_refptr<AudioStreamIndicator> audio_stream_indicator_;
+
+ scoped_ptr<ScreenCaptureConfirmationUI> screen_capture_confirmation_ui_;
};
#endif // CHROME_BROWSER_MEDIA_MEDIA_CAPTURE_DEVICES_DISPATCHER_H_

Powered by Google App Engine
This is Rietveld 408576698