chrome/browser/extensions/convert_user_script.cc - Issue 236213002: Move most of extension_file_util.cc into extensions/common/file_util.cc

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 236213002: Move most of extension_file_util.cc into extensions/common/file_util.cc (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: zip (file-util) Created 6 years, 8 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

« apps/shell/DEPS ('K') | « chrome/browser/extensions/component_loader.cc ('k') | chrome/browser/extensions/convert_web_app.cc » ('j') | chrome/common/extensions/extension_file_util_unittest.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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 933bcc5d6cf86a1bbc288e75171e309798c9df17..b67892cea7cbd3b15578b866da4563d309a5e304 100644

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

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

@@ -17,10 +17,10 @@

#include "base/strings/utf_string_conversions.h"

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

#include "chrome/common/chrome_paths.h"

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

#include "crypto/sha2.h"

#include "extensions/common/constants.h"

#include "extensions/common/extension.h"

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

#include "extensions/common/manifest_constants.h"

#include "extensions/common/user_script.h"

#include "url/gurl.h"

@@ -52,7 +52,7 @@ scoped_refptr<Extension> ConvertUserScriptToExtension(

}

base::FilePath install_temp_dir =

- extension_file_util::GetInstallTempDir(extensions_dir);

+ file_util::GetInstallTempDir(extensions_dir);

if (install_temp_dir.empty()) {

*error = base::ASCIIToUTF16(

"Could not get path to profile temporary directory.");