summaryrefslogtreecommitdiffstats
path: root/chrome/chrome.gyp
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/chrome.gyp
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/chrome.gyp')
-rwxr-xr-xchrome/chrome.gyp13
1 files changed, 8 insertions, 5 deletions
diff --git a/chrome/chrome.gyp b/chrome/chrome.gyp
index fb39caf..07b32bd 100755
--- a/chrome/chrome.gyp
+++ b/chrome/chrome.gyp
@@ -499,6 +499,8 @@
'common/extensions/extension_action.h',
'common/extensions/extension_message_bundle.cc',
'common/extensions/extension_message_bundle.h',
+ 'common/extensions/extension_resource.cc',
+ 'common/extensions/extension_resource.h',
'common/extensions/extension_unpacker.cc',
'common/extensions/extension_unpacker.h',
'common/extensions/update_manifest.cc',
@@ -1281,8 +1283,12 @@
'browser/extensions/external_registry_extension_provider_win.h',
'browser/extensions/external_pref_extension_provider.cc',
'browser/extensions/external_pref_extension_provider.h',
+ 'browser/extensions/file_reader.cc',
+ 'browser/extensions/file_reader.h',
'browser/extensions/gtk_theme_preview_infobar_delegate.cc',
'browser/extensions/gtk_theme_preview_infobar_delegate.h',
+ 'browser/extensions/image_loading_tracker.cc',
+ 'browser/extensions/image_loading_tracker.h',
'browser/extensions/pack_extension_job.cc',
'browser/extensions/pack_extension_job.h',
'browser/extensions/sandboxed_extension_unpacker.cc',
@@ -1553,8 +1559,6 @@
'browser/icon_manager_linux.cc',
'browser/icon_manager_mac.mm',
'browser/icon_manager_win.cc',
- 'browser/image_loading_tracker.cc',
- 'browser/image_loading_tracker.h',
'browser/ime_input.cc',
'browser/ime_input.h',
'browser/importer/firefox2_importer.cc',
@@ -1660,8 +1664,6 @@
'browser/net/dns_host_info.h',
'browser/net/dns_master.cc',
'browser/net/dns_master.h',
- 'browser/net/file_reader.cc',
- 'browser/net/file_reader.h',
'browser/net/metadata_url_request.cc',
'browser/net/metadata_url_request.h',
'browser/net/referrer.cc',
@@ -4251,6 +4253,7 @@
'browser/extensions/extension_ui_unittest.cc',
'browser/extensions/extension_updater_unittest.cc',
'browser/extensions/extensions_service_unittest.cc',
+ 'browser/extensions/file_reader_unittest.cc',
'browser/extensions/user_script_listener_unittest.cc',
'browser/extensions/user_script_master_unittest.cc',
'browser/find_backend_unittest.cc',
@@ -4303,7 +4306,6 @@
'browser/net/chrome_url_request_context_unittest.cc',
'browser/net/dns_host_info_unittest.cc',
'browser/net/dns_master_unittest.cc',
- 'browser/net/file_reader_unittest.cc',
'browser/net/resolve_proxy_msg_helper_unittest.cc',
'browser/net/test_url_fetcher_factory.cc',
'browser/net/test_url_fetcher_factory.h',
@@ -4368,6 +4370,7 @@
'common/child_process_logging_mac_unittest.mm',
'common/chrome_plugin_unittest.cc',
'common/common_param_traits_unittest.cc',
+ 'common/extensions/extension_resource_unittest.cc',
'common/extensions/extension_unittest.cc',
'common/extensions/extension_message_bundle_unittest.cc',
'common/extensions/update_manifest_unittest.cc',