third_party/WebKit/Source/modules/imagecapture/ImageCapture.h - Issue 2537573002: Revert of ImageCapture: move image_capture.mojom from media/mojo/interfaces/ to media/capture/mojo/

Side by Side Diff

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Side by Side Diff: third_party/WebKit/Source/modules/imagecapture/ImageCapture.h

Issue 2537573002: Revert of ImageCapture: move image_capture.mojom from media/mojo/interfaces/ to media/capture/mojo/ (Closed)

Patch Set: Created 4 years 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

OLD	NEW
1 // Copyright 2016 The Chromium Authors. All rights reserved.	1 // Copyright 2016 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 #ifndef ImageCapture_h	5 #ifndef ImageCapture_h

6 #define ImageCapture_h	6 #define ImageCapture_h

7	7

8 #include "bindings/core/v8/ActiveScriptWrappable.h"	8 #include "bindings/core/v8/ActiveScriptWrappable.h"

9 #include "bindings/core/v8/ScriptPromise.h"	9 #include "bindings/core/v8/ScriptPromise.h"

10 #include "core/dom/ContextLifecycleObserver.h"	10 #include "core/dom/ContextLifecycleObserver.h"

11 #include "core/events/EventTarget.h"	11 #include "core/events/EventTarget.h"

12 #include "media/capture/mojo/image_capture.mojom-blink.h"	12 #include "media/mojo/interfaces/image_capture.mojom-blink.h"

13 #include "modules/EventTargetModules.h"	13 #include "modules/EventTargetModules.h"

14 #include "modules/ModulesExport.h"	14 #include "modules/ModulesExport.h"

15 #include "platform/AsyncMethodRunner.h"	15 #include "platform/AsyncMethodRunner.h"

16 #include <memory>	16 #include <memory>

17	17

18 namespace blink {	18 namespace blink {

19	19

20 class ExceptionState;	20 class ExceptionState;

21 class MediaStreamTrack;	21 class MediaStreamTrack;

22 class PhotoSettings;	22 class PhotoSettings;

(...skipping 47 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
70 Member<MediaStreamTrack> m_streamTrack;	70 Member<MediaStreamTrack> m_streamTrack;

71 std::unique_ptr<WebImageCaptureFrameGrabber> m_frameGrabber;	71 std::unique_ptr<WebImageCaptureFrameGrabber> m_frameGrabber;

72 media::mojom::blink::ImageCapturePtr m_service;	72 media::mojom::blink::ImageCapturePtr m_service;

73	73

74 HeapHashSet<Member<ScriptPromiseResolver>> m_serviceRequests;	74 HeapHashSet<Member<ScriptPromiseResolver>> m_serviceRequests;

75 };	75 };

76	76

77 } // namespace blink	77 } // namespace blink

78	78

79 #endif // ImageCapture_h	79 #endif // ImageCapture_h

OLD	NEW