chrome/browser/extensions/api/desktop_capture/desktop_capture_base.h - Issue 2307083002: Cleanup: move WebRTC related files from chrome/browser/media to chrome/browser/media/webrtc/

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: chrome/browser/extensions/api/desktop_capture/desktop_capture_base.h

Issue 2307083002: Cleanup: move WebRTC related files from chrome/browser/media to chrome/browser/media/webrtc/ (Closed)

Patch Set: Removed file wrongly resuscitated during rebase Created 4 years, 3 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

« no previous file with comments | « chrome/browser/extensions/api/desktop_capture/desktop_capture_apitest.cc ('k') | chrome/browser/extensions/api/desktop_capture/desktop_capture_base.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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

6 #define CHROME_BROWSER_EXTENSIONS_API_DESKTOP_CAPTURE_DESKTOP_CAPTURE_BASE_H_	6 #define CHROME_BROWSER_EXTENSIONS_API_DESKTOP_CAPTURE_DESKTOP_CAPTURE_BASE_H_

7	7

8 #include <array>	8 #include <array>

9 #include <map>	9 #include <map>

10	10

11 #include "base/macros.h"	11 #include "base/macros.h"

12 #include "base/memory/singleton.h"	12 #include "base/memory/singleton.h"

13 #include "chrome/browser/extensions/chrome_extension_function.h"	13 #include "chrome/browser/extensions/chrome_extension_function.h"

14 #include "chrome/browser/media/desktop_media_list.h"	14 #include "chrome/browser/media/webrtc/desktop_media_list.h"

15 #include "chrome/browser/media/desktop_media_picker.h"	15 #include "chrome/browser/media/webrtc/desktop_media_picker.h"

16 #include "chrome/common/extensions/api/desktop_capture.h"	16 #include "chrome/common/extensions/api/desktop_capture.h"

17 #include "content/public/browser/web_contents_observer.h"	17 #include "content/public/browser/web_contents_observer.h"

18 #include "url/gurl.h"	18 #include "url/gurl.h"

19	19

20 namespace extensions {	20 namespace extensions {

21	21

22 class DesktopCaptureChooseDesktopMediaFunctionBase	22 class DesktopCaptureChooseDesktopMediaFunctionBase

23 : public ChromeAsyncExtensionFunction,	23 : public ChromeAsyncExtensionFunction,

24 public content::WebContentsObserver {	24 public content::WebContentsObserver {

25 public:	25 public:

(...skipping 93 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
119 std::map<RequestId, DesktopCaptureChooseDesktopMediaFunctionBase*>;	119 std::map<RequestId, DesktopCaptureChooseDesktopMediaFunctionBase*>;

120	120

121 RequestsMap requests_;	121 RequestsMap requests_;

122	122

123 DISALLOW_COPY_AND_ASSIGN(DesktopCaptureRequestsRegistry);	123 DISALLOW_COPY_AND_ASSIGN(DesktopCaptureRequestsRegistry);

124 };	124 };

125	125

126 } // namespace extensions	126 } // namespace extensions

127	127

128 #endif // CHROME_BROWSER_EXTENSIONS_API_DESKTOP_CAPTURE_DESKTOP_CAPTURE_BASE_H_	128 #endif // CHROME_BROWSER_EXTENSIONS_API_DESKTOP_CAPTURE_DESKTOP_CAPTURE_BASE_H_

OLD	NEW