chrome/browser/media/webrtc/desktop_capture_access_handler.cc - 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/media/webrtc/desktop_capture_access_handler.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/media/webrtc/desktop_capture_access_handler.h ('k') | chrome/browser/media/webrtc/desktop_media_list.h » ('j') | no next file with comments »

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/media/desktop_capture_access_handler.h"	5 #include "chrome/browser/media/webrtc/desktop_capture_access_handler.h"

6	6

7 #include <utility>	7 #include <utility>

8	8

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

10 #include "base/strings/string_number_conversions.h"	10 #include "base/strings/string_number_conversions.h"

11 #include "base/strings/string_util.h"	11 #include "base/strings/string_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/media/desktop_streams_registry.h"	14 #include "chrome/browser/media/webrtc/desktop_streams_registry.h"

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

16 #include "chrome/browser/ui/browser.h"	16 #include "chrome/browser/ui/browser.h"

17 #include "chrome/browser/ui/browser_finder.h"	17 #include "chrome/browser/ui/browser_finder.h"

18 #include "chrome/browser/ui/browser_window.h"	18 #include "chrome/browser/ui/browser_window.h"

19 #include "chrome/browser/ui/screen_capture_notification_ui.h"	19 #include "chrome/browser/ui/screen_capture_notification_ui.h"

20 #include "chrome/browser/ui/simple_message_box.h"	20 #include "chrome/browser/ui/simple_message_box.h"

21 #include "chrome/common/chrome_switches.h"	21 #include "chrome/common/chrome_switches.h"

22 #include "chrome/grit/generated_resources.h"	22 #include "chrome/grit/generated_resources.h"

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

24 #include "content/public/browser/desktop_media_id.h"	24 #include "content/public/browser/desktop_media_id.h"

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

(...skipping 400 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
426 audio_supported;	426 audio_supported;

427	427

428 ui = GetDevicesForDesktopCapture(&devices, media_id, capture_audio, false,	428 ui = GetDevicesForDesktopCapture(&devices, media_id, capture_audio, false,

429 true,	429 true,

430 GetApplicationTitle(web_contents, extension),	430 GetApplicationTitle(web_contents, extension),

431 base::UTF8ToUTF16(original_extension_name));	431 base::UTF8ToUTF16(original_extension_name));

432 UpdateExtensionTrusted(request, extension);	432 UpdateExtensionTrusted(request, extension);

433 callback.Run(devices, content::MEDIA_DEVICE_OK, std::move(ui));	433 callback.Run(devices, content::MEDIA_DEVICE_OK, std::move(ui));

434 }	434 }

435	435

OLD	NEW