chrome/browser/extensions/user_script_master.cc - Issue 63011: Monster FilePath patch!

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 63011: Monster FilePath patch! (Closed)

Patch Set: sync with trunk Created 11 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:

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 03b54b9c2b0c6c75921359eca7d3eb5107a2785f..723b1f3481eb52dcfae992d2509536ce8133df62 100644

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

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

@@ -155,7 +155,7 @@ void UserScriptMaster::ScriptReloader::LoadScriptsFromDirectory(

UserScript& user_script = result->back();

// Push single js file in this UserScript.

GURL url(std::string(chrome::kUserScriptScheme) + ":/" +

- net::FilePathToFileURL(file.ToWStringHack()).ExtractFileName());

+ net::FilePathToFileURL(file).ExtractFileName());

user_script.js_scripts().push_back(UserScript::File(file, url));

UserScript::File& script_file = user_script.js_scripts().back();

LoadScriptContent(&script_file);

« no previous file with comments | « chrome/browser/download/save_package.cc ('k') | chrome/browser/history/redirect_uitest.cc » ('j') | no next file with comments »