chrome/browser/ui/media_utils.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/ui/media_utils.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/ui/content_settings/content_setting_media_menu_model.cc ('k') | chrome/browser/ui/tabs/tab_utils.cc » ('j') | no next file with comments »

OLD	NEW
1 // Copyright 2013 The Chromium Authors. All rights reserved.	1 // Copyright 2013 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/ui/media_utils.h"	5 #include "chrome/browser/ui/media_utils.h"

6	6

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

8 #include "chrome/browser/profiles/profile.h"	8 #include "chrome/browser/profiles/profile.h"

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

10	10

11 #if defined(ENABLE_EXTENSIONS)	11 #if defined(ENABLE_EXTENSIONS)

12 #include "extensions/browser/extension_registry.h"	12 #include "extensions/browser/extension_registry.h"

13 #include "extensions/common/constants.h"	13 #include "extensions/common/constants.h"

14 #endif	14 #endif

15	15

16 namespace {	16 namespace {

17	17

(...skipping 39 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
57 ->CheckMediaAccessPermission(	57 ->CheckMediaAccessPermission(

58 web_contents, security_origin, type, extension);	58 web_contents, security_origin, type, extension);

59 }	59 }

60 return MediaCaptureDevicesDispatcher::GetInstance()	60 return MediaCaptureDevicesDispatcher::GetInstance()

61 ->CheckMediaAccessPermission(web_contents, security_origin, type);	61 ->CheckMediaAccessPermission(web_contents, security_origin, type);

62 #else	62 #else

63 return MediaCaptureDevicesDispatcher::GetInstance()	63 return MediaCaptureDevicesDispatcher::GetInstance()

64 ->CheckMediaAccessPermission(web_contents, security_origin, type);	64 ->CheckMediaAccessPermission(web_contents, security_origin, type);

65 #endif	65 #endif

66 }	66 }

OLD	NEW