components/content_settings/core/browser/content_settings_override_provider.cc - Issue 670953006: Componentize HostContentSettingsMap and content settings providers.

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: components/content_settings/core/browser/content_settings_override_provider.cc

Issue 670953006: Componentize HostContentSettingsMap and content settings providers. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: win64 suppress warnings Created 6 years, 2 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 | « components/content_settings/core/browser/content_settings_override_provider.h ('k') | components/content_settings/core/browser/content_settings_policy_provider.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: components/content_settings/core/browser/content_settings_override_provider.cc

diff --git a/chrome/browser/content_settings/content_settings_override_provider.cc b/components/content_settings/core/browser/content_settings_override_provider.cc

similarity index 94%

rename from chrome/browser/content_settings/content_settings_override_provider.cc

rename to components/content_settings/core/browser/content_settings_override_provider.cc

index 659096a488b36fee173d075a0ce0771cfc8a5ec8..edb36a58c0e13c146881fa5509c5fddc316f9d46 100644

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

+++ b/components/content_settings/core/browser/content_settings_override_provider.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/content_settings/content_settings_override_provider.h"

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

#include <string>

@@ -10,11 +10,11 @@

#include "base/prefs/pref_service.h"

#include "base/prefs/scoped_user_pref_update.h"

#include "base/values.h"

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

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

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

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

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

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

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

#include "components/pref_registry/pref_registry_syncable.h"

namespace content_settings {