chrome/browser/extensions/extension_service.cc - Issue 748723002: Move content_settings_custom_extension_provider.* to c/b/extensions/api/content_settings/

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

Issue 748723002: Move content_settings_custom_extension_provider.* to c/b/extensions/api/content_settings/ (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Created 6 years, 1 month 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_custom_extension_provider.cc ('k') | chrome/chrome_browser.gypi » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/extensions/extension_service.cc

diff --git a/chrome/browser/extensions/extension_service.cc b/chrome/browser/extensions/extension_service.cc

index 283f42a1fc3059b09f965b156b5455ac1dbfa62c..3689543b6eabaea74216d6612700d320a7a32478 100644

--- a/chrome/browser/extensions/extension_service.cc

+++ b/chrome/browser/extensions/extension_service.cc

@@ -18,8 +18,8 @@

#include "base/time/time.h"

#include "chrome/browser/browser_process.h"

#include "chrome/browser/chrome_notification_types.h"

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

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

+#include "chrome/browser/extensions/api/content_settings/content_settings_custom_extension_provider.h"

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

#include "chrome/browser/extensions/component_loader.h"

#include "chrome/browser/extensions/crx_installer.h"