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

Side by Side Diff: chrome/browser/extensions/api/desktop_capture/desktop_capture_base.cc

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_base.h ('k') | chrome/browser/extensions/api/tab_capture/tab_capture_registry.h » ('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 #include "chrome/browser/extensions/api/desktop_capture/desktop_capture_base.h"	5 #include "chrome/browser/extensions/api/desktop_capture/desktop_capture_base.h"

6	6

7 #include <tuple>	7 #include <tuple>

8 #include <utility>	8 #include <utility>

9	9

10 #include "base/command_line.h"	10 #include "base/command_line.h"

11 #include "base/memory/ptr_util.h"	11 #include "base/memory/ptr_util.h"

12 #include "base/strings/utf_string_conversions.h"	12 #include "base/strings/utf_string_conversions.h"

13 #include "build/build_config.h"	13 #include "build/build_config.h"

14 #include "chrome/browser/extensions/extension_tab_util.h"	14 #include "chrome/browser/extensions/extension_tab_util.h"

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

16 #include "chrome/browser/media/desktop_streams_registry.h"	16 #include "chrome/browser/media/webrtc/desktop_streams_registry.h"

17 #include "chrome/browser/media/media_capture_devices_dispatcher.h"	17 #include "chrome/browser/media/webrtc/media_capture_devices_dispatcher.h"

18 #include "chrome/browser/media/native_desktop_media_list.h"	18 #include "chrome/browser/media/webrtc/native_desktop_media_list.h"

19 #include "chrome/browser/media/tab_desktop_media_list.h"	19 #include "chrome/browser/media/webrtc/tab_desktop_media_list.h"

20 #include "components/version_info/version_info.h"	20 #include "components/version_info/version_info.h"

21 #include "content/public/browser/render_frame_host.h"	21 #include "content/public/browser/render_frame_host.h"

22 #include "content/public/browser/render_process_host.h"	22 #include "content/public/browser/render_process_host.h"

23 #include "content/public/browser/web_contents.h"	23 #include "content/public/browser/web_contents.h"

24 #include "extensions/common/switches.h"	24 #include "extensions/common/switches.h"

25 #include "third_party/webrtc/modules/desktop_capture/desktop_capture_options.h"	25 #include "third_party/webrtc/modules/desktop_capture/desktop_capture_options.h"

26 #include "third_party/webrtc/modules/desktop_capture/screen_capturer.h"	26 #include "third_party/webrtc/modules/desktop_capture/screen_capturer.h"

27 #include "third_party/webrtc/modules/desktop_capture/window_capturer.h"	27 #include "third_party/webrtc/modules/desktop_capture/window_capturer.h"

28	28

29 namespace extensions {	29 namespace extensions {

(...skipping 242 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
272	272

273 void DesktopCaptureRequestsRegistry::CancelRequest(int process_id,	273 void DesktopCaptureRequestsRegistry::CancelRequest(int process_id,

274 int request_id) {	274 int request_id) {

275 RequestsMap::iterator it = requests_.find(RequestId(process_id, request_id));	275 RequestsMap::iterator it = requests_.find(RequestId(process_id, request_id));

276 if (it != requests_.end())	276 if (it != requests_.end())

277 it->second->Cancel();	277 it->second->Cancel();

278 }	278 }

279	279

280	280

281 } // namespace extensions	281 } // namespace extensions

OLD	NEW