chrome/browser/extensions/user_script_master.cc - Issue 15239002: Move Extension and PermissionsData to extensions/common.

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

Issue 15239002: Move Extension and PermissionsData to extensions/common. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

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

Index: chrome/browser/extensions/user_script_master.cc

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

index 4a9ff1ca019c9024a08cb75cfd6c7e5370f0c1f2..3c3dc69add5e3bf677cf8ebbf272218d5dedf560 100644

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

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

@@ -23,13 +23,13 @@

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

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

#include "chrome/common/extensions/api/i18n/default_locale_handler.h"

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

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

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

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

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

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

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

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

#include "extensions/common/extension_resource.h"

#include "ui/base/resource/resource_bundle.h"