chrome/browser/media/media_capture_devices_dispatcher.cc - Issue 579673003: Move content_settings_observer.h, content_settings_provider.h, content_settings_rule.* to the compo…

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_capture_devices_dispatcher.cc

Issue 579673003: Move content_settings_observer.h, content_settings_provider.h, content_settings_rule.* to the compo… (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: add DEPS 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:

View side-by-side diff with in-line comments

Download patch

« no previous file with comments | « chrome/browser/extensions/api/content_settings/content_settings_store_unittest.cc ('k') | chrome/browser/media/media_stream_devices_controller.cc » ('j') | chrome/browser/ui/webui/options/content_settings_handler.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/media/media_capture_devices_dispatcher.cc

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

index a3a1ddcf23d30ab14882fad7b5f4cd158dd6d2a9..d3479ee824f6aedd954e0519b780aab7f9558d20 100644

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

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

@@ -13,7 +13,6 @@

#include "base/strings/string_number_conversions.h"

#include "base/strings/string_util.h"

#include "base/strings/utf_string_conversions.h"

-#include "chrome/browser/content_settings/content_settings_provider.h"

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

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

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

@@ -30,6 +29,7 @@

#include "chrome/common/chrome_version_info.h"

#include "chrome/common/pref_names.h"

#include "chrome/grit/generated_resources.h"

+#include "components/content_settings/core/browser/content_settings_provider.h"

#include "components/pref_registry/pref_registry_syncable.h"

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

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