chrome/browser/media/media_stream_devices_controller.cc - Issue 541813002: Componentize chrome/common/content_settings files.

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/media_stream_devices_controller.cc

Issue 541813002: Componentize chrome/common/content_settings files. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: GN fix Created 6 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/media_stream_devices_controller.cc

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

index 7a15c14f1bf99cfef501f164a5ff4523eafc620b..cbb90477a093a29b92148782de09b63dbde51a07 100644

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

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

@@ -17,9 +17,9 @@

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

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

#include "chrome/common/chrome_switches.h"

-#include "chrome/common/content_settings.h"

#include "chrome/common/pref_names.h"

#include "chrome/grit/generated_resources.h"

+#include "components/content_settings/core/common/content_settings.h"

#include "components/content_settings/core/common/content_settings_pattern.h"

#include "components/pref_registry/pref_registry_syncable.h"

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