chrome/browser/extensions/api/content_settings/content_settings_api.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: chrome/browser/extensions/api/content_settings/content_settings_api.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 | « chrome/browser/download/download_request_limiter_unittest.cc ('k') | chrome/browser/extensions/api/content_settings/content_settings_apitest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/extensions/api/content_settings/content_settings_api.cc

diff --git a/chrome/browser/extensions/api/content_settings/content_settings_api.cc b/chrome/browser/extensions/api/content_settings/content_settings_api.cc

index ad5904520f250d96cb35f3db887186a932ddd7d0..d9d174c3252a31b1b26c95666cecee5c3ceb580e 100644

--- a/chrome/browser/extensions/api/content_settings/content_settings_api.cc

+++ b/chrome/browser/extensions/api/content_settings/content_settings_api.cc

@@ -12,7 +12,6 @@

#include "base/memory/scoped_ptr.h"

#include "base/values.h"

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

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

#include "chrome/browser/extensions/api/content_settings/content_settings_api_constants.h"

#include "chrome/browser/extensions/api/content_settings/content_settings_helpers.h"

#include "chrome/browser/extensions/api/content_settings/content_settings_service.h"

@@ -24,6 +23,7 @@

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

#include "chrome/common/chrome_switches.h"

#include "chrome/common/extensions/api/content_settings.h"

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

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

#include "extensions/browser/extension_prefs_scope.h"

#include "extensions/common/error_utils.h"