chrome/browser/media/webrtc/media_stream_devices_controller.cc - Issue 2307083002: Cleanup: move WebRTC related files from chrome/browser/media to chrome/browser/media/webrtc/

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

Unified Diff: chrome/browser/media/webrtc/media_stream_devices_controller.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:

Index: chrome/browser/media/webrtc/media_stream_devices_controller.cc

diff --git a/chrome/browser/media/media_stream_devices_controller.cc b/chrome/browser/media/webrtc/media_stream_devices_controller.cc

similarity index 98%

rename from chrome/browser/media/media_stream_devices_controller.cc

rename to chrome/browser/media/webrtc/media_stream_devices_controller.cc

index 445d71265be185468eb12f2bfe620a4c01e4a64d..3e10d38733c5840f7d4b0863188ca0c9c4a39b4a 100644

--- a/chrome/browser/media/media_stream_devices_controller.cc

+++ b/chrome/browser/media/webrtc/media_stream_devices_controller.cc

@@ -2,7 +2,7 @@

// Use of this source code is governed by a BSD-style license that can be

// found in the LICENSE file.

-#include "chrome/browser/media/media_stream_devices_controller.h"

+#include "chrome/browser/media/webrtc/media_stream_devices_controller.h"

#include <map>

#include <utility>

@@ -15,10 +15,10 @@

#include "base/values.h"

#include "chrome/browser/content_settings/host_content_settings_map_factory.h"

#include "chrome/browser/content_settings/tab_specific_content_settings.h"

-#include "chrome/browser/media/media_capture_devices_dispatcher.h"

-#include "chrome/browser/media/media_permission.h"

-#include "chrome/browser/media/media_stream_capture_indicator.h"

-#include "chrome/browser/media/media_stream_device_permissions.h"

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

+#include "chrome/browser/media/webrtc/media_permission.h"

+#include "chrome/browser/media/webrtc/media_stream_capture_indicator.h"

+#include "chrome/browser/media/webrtc/media_stream_device_permissions.h"

#include "chrome/browser/permissions/permission_uma_util.h"

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

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