chrome/browser/extensions/extension_service.cc - Issue 23257005: Move Feature and Manifest to top-level extensions.

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 23257005: Move Feature and Manifest to top-level extensions. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: rebase Created 7 years, 4 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:

Index: chrome/browser/extensions/extension_service.cc

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

index 199b1f7c3c2a8a50cd8b921d0b17655c900ded64..8c991403050c163a67410e26038af1646bb5a49d 100644

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

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

@@ -79,7 +79,6 @@

#include "chrome/common/extensions/feature_switch.h"

#include "chrome/common/extensions/features/feature_channel.h"

#include "chrome/common/extensions/incognito_handler.h"

-#include "chrome/common/extensions/manifest.h"

#include "chrome/common/extensions/manifest_handlers/app_isolation_info.h"

#include "chrome/common/extensions/manifest_handlers/app_launch_info.h"

#include "chrome/common/extensions/manifest_handlers/shared_module_info.h"

@@ -99,6 +98,7 @@

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

#include "extensions/common/constants.h"

#include "extensions/common/error_utils.h"

+#include "extensions/common/manifest.h"

#include "grit/generated_resources.h"

#include "net/base/registry_controlled_domains/registry_controlled_domain.h"

#include "sync/api/sync_change.h"