summaryrefslogtreecommitdiffstats
path: root/chrome/common/extensions/user_script_unittest.cc
diff options
context:
space:
mode:
authorcira@chromium.org <cira@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-10-07 22:49:10 +0000
committercira@chromium.org <cira@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-10-07 22:49:10 +0000
commitecabe6eed156a36238888bfd2fdb96ec4906f0a4 (patch)
tree9419d9a349fc940d45fa450b3a75169fdf48b39f /chrome/common/extensions/user_script_unittest.cc
parent7050861ff094fd74d155264b6da3ca3795543870 (diff)
downloadchromium_src-ecabe6eed156a36238888bfd2fdb96ec4906f0a4.zip
chromium_src-ecabe6eed156a36238888bfd2fdb96ec4906f0a4.tar.gz
chromium_src-ecabe6eed156a36238888bfd2fdb96ec4906f0a4.tar.bz2
Loads local resources from current locale subtree if available, if not it falls back to extension subtree.
We look for ext_root/foo/bar.js under ext_root/_locales/fr/foo/bar.js if current locale is fr. If there is no fr specific resource we load ext_root/foo/bar.js instead. Lots of small refactoring to replace FilePath with ExtensionResource. BUG=12131 TEST=See unittest for sample tree. Review URL: http://codereview.chromium.org/256022 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@28333 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/common/extensions/user_script_unittest.cc')
-rw-r--r--chrome/common/extensions/user_script_unittest.cc9
1 files changed, 6 insertions, 3 deletions
diff --git a/chrome/common/extensions/user_script_unittest.cc b/chrome/common/extensions/user_script_unittest.cc
index 62fa0a3..0c0bac9 100644
--- a/chrome/common/extensions/user_script_unittest.cc
+++ b/chrome/common/extensions/user_script_unittest.cc
@@ -78,13 +78,16 @@ TEST(UserScriptTest, Pickle) {
UserScript script1;
script1.js_scripts().push_back(UserScript::File(
- FilePath(FILE_PATH_LITERAL("c:\\foo\\foo.user.js")),
+ ExtensionResource(FilePath(FILE_PATH_LITERAL("c:\\foo\\")),
+ FilePath(FILE_PATH_LITERAL("foo.user.js"))),
GURL("chrome-user-script:/foo.user.js")));
script1.css_scripts().push_back(UserScript::File(
- FilePath(FILE_PATH_LITERAL("c:\\foo\\foo.user.css")),
+ ExtensionResource(FilePath(FILE_PATH_LITERAL("c:\\foo\\")),
+ FilePath(FILE_PATH_LITERAL("foo.user.css"))),
GURL("chrome-user-script:/foo.user.css")));
script1.css_scripts().push_back(UserScript::File(
- FilePath(FILE_PATH_LITERAL("c:\\foo\\foo2.user.css")),
+ ExtensionResource(FilePath(FILE_PATH_LITERAL("c:\\foo\\")),
+ FilePath(FILE_PATH_LITERAL("foo2.user.css"))),
GURL("chrome-user-script:/foo2.user.css")));
script1.set_run_location(UserScript::DOCUMENT_START);