chrome/browser/extensions/crx_installer.cc - Issue 19678004: Move UserScript and Extension switches 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/crx_installer.cc

Issue 19678004: Move UserScript and Extension switches to top-level extensions/. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: rebase Created 7 years, 5 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/crx_installer.cc

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

index 2d2e0ae38f3c2f2f45334e70d7c896401aa994ae..588e2f17d796d23a11cfac5a2e2a8b232624d637 100644

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

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

@@ -41,11 +41,11 @@

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

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

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

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

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

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

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

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

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

#include "grit/chromium_strings.h"

#include "grit/generated_resources.h"

#include "grit/theme_resources.h"