chrome/browser/content_settings/host_content_settings_map.cc - Issue 584753003: Move content_settings_observable_provider and content_seettings_origin_identifier_value_map

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/content_settings/host_content_settings_map.cc

Issue 584753003: Move content_settings_observable_provider and content_seettings_origin_identifier_value_map (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: 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/content_settings/content_settings_pref_provider.h ('k') | chrome/browser/extensions/api/content_settings/content_settings_store.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/content_settings/host_content_settings_map.cc

diff --git a/chrome/browser/content_settings/host_content_settings_map.cc b/chrome/browser/content_settings/host_content_settings_map.cc

index f17e2683b748359489b9946f901280c91c263216..d0554547abe9a2f0f48b26b1be783dc4a7432c42 100644

--- a/chrome/browser/content_settings/host_content_settings_map.cc

+++ b/chrome/browser/content_settings/host_content_settings_map.cc

@@ -14,7 +14,6 @@

#include "base/strings/utf_string_conversions.h"

#include "base/time/clock.h"

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

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

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

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

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

@@ -22,6 +21,7 @@

#include "chrome/common/pref_names.h"

#include "chrome/common/url_constants.h"

#include "components/content_settings/core/browser/content_settings_details.h"

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

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

#include "components/content_settings/core/browser/content_settings_rule.h"

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