Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1502)

Unified Diff: chrome/browser/extensions/extension_file_util.cc

Issue 267051: Minimize dependency of user scripts.... (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: '' Created 11 years, 2 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/extension_file_util.cc
===================================================================
--- chrome/browser/extensions/extension_file_util.cc (revision 29458)
+++ chrome/browser/extensions/extension_file_util.cc (working copy)
@@ -184,8 +184,9 @@
const UserScript& script = extension->content_scripts()[i];
for (size_t j = 0; j < script.js_scripts().size(); j++) {
- const FilePath& path =
- script.js_scripts()[j].resource().GetFilePath();
+ const UserScript::File& js_script = script.js_scripts()[j];
+ const FilePath& path = ExtensionResource::GetFilePath(
+ js_script.extension_root(), js_script.relative_path());
if (path.empty()) {
*error = StringPrintf("Could not load '%s' for content script.",
WideToUTF8(path.ToWStringHack()).c_str());
@@ -194,8 +195,9 @@
}
for (size_t j = 0; j < script.css_scripts().size(); j++) {
- const FilePath& path =
- script.css_scripts()[j].resource().GetFilePath();
+ const UserScript::File& css_script = script.css_scripts()[j];
+ const FilePath& path = ExtensionResource::GetFilePath(
+ css_script.extension_root(), css_script.relative_path());
if (path.empty()) {
*error = StringPrintf("Could not load '%s' for content script.",
WideToUTF8(path.ToWStringHack()).c_str());

Powered by Google App Engine
This is Rietveld 408576698