chrome/browser/extensions/convert_user_script.cc - Issue 23744004: Move the rest of extension_manifest_constants 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/convert_user_script.cc

Issue 23744004: Move the rest of extension_manifest_constants to top-level extensions/ (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Latest master Created 7 years, 3 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

Index: chrome/browser/extensions/convert_user_script.cc

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

index 043fae27b26eafc5b4c2be66b411bbe9fdf59846..b3149694700e33bc97bcd1c9a1d62673ef8494f9 100644

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

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

@@ -19,17 +19,17 @@

#include "chrome/common/chrome_paths.h"

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

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

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

#include "crypto/sha2.h"

#include "extensions/common/constants.h"

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

#include "extensions/common/user_script.h"

#include "url/gurl.h"

-namespace keys = extensions::manifest_keys;

-namespace values = extension_manifest_values;

namespace extensions {

+namespace keys = manifest_keys;

+namespace values = manifest_values;

scoped_refptr<Extension> ConvertUserScriptToExtension(

const base::FilePath& user_script_path, const GURL& original_url,

const base::FilePath& extensions_dir, string16* error) {

« no previous file with comments | « chrome/browser/extensions/bundle_installer.cc ('k') | chrome/browser/extensions/extension_browsertest.cc » ('j') | no next file with comments »