diff options
author | erg@chromium.org <erg@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-06-24 22:34:09 +0000 |
---|---|---|
committer | erg@chromium.org <erg@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-06-24 22:34:09 +0000 |
commit | 01b12ba89a6117a849ac2537d58991c76f2f2da2 (patch) | |
tree | cd6ffd0ee6e1dc18c1bd5fe39c47ea1c1e9d3851 /chrome/chrome_browser.gypi | |
parent | 9b7262502272c7ea9016b9ed21b0f828f75b5998 (diff) | |
download | chromium_src-01b12ba89a6117a849ac2537d58991c76f2f2da2.zip chromium_src-01b12ba89a6117a849ac2537d58991c76f2f2da2.tar.gz chromium_src-01b12ba89a6117a849ac2537d58991c76f2f2da2.tar.bz2 |
Revert 50761 - Move the files in resources/shared/ into resources.pak
BUG=35793,42770
TEST=none
Review URL: http://codereview.chromium.org/2817026
TBR=erg@chromium.org
Review URL: http://codereview.chromium.org/2855021
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@50777 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/chrome_browser.gypi')
-rw-r--r-- | chrome/chrome_browser.gypi | 76 |
1 files changed, 72 insertions, 4 deletions
diff --git a/chrome/chrome_browser.gypi b/chrome/chrome_browser.gypi index a1bca3c..e649a27 100644 --- a/chrome/chrome_browser.gypi +++ b/chrome/chrome_browser.gypi @@ -16,6 +16,7 @@ 'chrome_strings', 'chrome_version_info', 'component_extensions', + 'domui_shared_resources', 'platform_locale_settings', 'profile_import', 'browser/sync/protocol/sync_proto.gyp:sync_proto_cpp', @@ -1030,8 +1031,6 @@ 'browser/dom_ui/plugins_ui.h', 'browser/dom_ui/remoting_ui.cc', 'browser/dom_ui/remoting_ui.h', - 'browser/dom_ui/shared_resources_data_source.cc', - 'browser/dom_ui/shared_resources_data_source.h', 'browser/dom_ui/shown_sections_handler.cc', 'browser/dom_ui/shown_sections_handler.h', 'browser/dom_ui/slideshow_ui.cc', @@ -2708,9 +2707,8 @@ # These files are generated by GRIT. '<(grit_out_dir)/grit/bookmark_manager_resources_map.cc', - '<(grit_out_dir)/grit/net_internals_resources_map.cc', - '<(grit_out_dir)/grit/shared_resources_map.cc', '<(grit_out_dir)/grit/theme_resources_map.cc', + '<(grit_out_dir)/grit/net_internals_resources_map.cc', ], 'conditions': [ ['javascript_engine=="v8"', { @@ -3404,6 +3402,76 @@ ], }, { + 'target_name': 'domui_shared_resources', + 'type': 'none', + 'msvs_guid': '7BB23C84-71AA-4320-9EE1-9EBCDB04C964', + # TODO(arv): Once the msvs port supports it, change this to recursively + # copy the entire directory instead of listing the files. + # TODO(arv): We also need to allow filters so we do not copy the test + # files. Tony said that another option would be to run a python script + # here instead. + # http://code.google.com/p/gyp/issues/detail?id=143. + 'copies': [ + { + 'destination': '<(PRODUCT_DIR)/resources/shared/css', + 'files': [ + 'browser/resources/shared/css/button.css', + 'browser/resources/shared/css/list.css', + 'browser/resources/shared/css/menu.css', + 'browser/resources/shared/css/tree.css', + 'browser/resources/shared/css/tree.css.js', + ] + }, + { + 'destination': '<(PRODUCT_DIR)/resources/shared/images', + 'files': [ + '../app/resources/folder_closed.png', + '../app/resources/folder_closed_rtl.png', + '../app/resources/folder_open.png', + '../app/resources/folder_open_rtl.png', + 'app/theme/bookmark_bar_folder_mac.png', + ] + }, + { + 'destination': '<(PRODUCT_DIR)/resources/shared/js', + 'files': [ + 'browser/resources/shared/js/class_list.js', + 'browser/resources/shared/js/cr.js', + 'browser/resources/shared/js/i18n_template.js', + 'browser/resources/shared/js/local_strings.js', + 'browser/resources/shared/js/parse_html_subset.js', + 'browser/resources/shared/js/util.js', + ] + }, + { + 'destination': '<(PRODUCT_DIR)/resources/shared/js/cr', + 'files': [ + 'browser/resources/shared/js/cr/event_target.js', + 'browser/resources/shared/js/cr/link_controller.js', + 'browser/resources/shared/js/cr/promise.js', + 'browser/resources/shared/js/cr/ui.js', + ] + }, + { + 'destination': '<(PRODUCT_DIR)/resources/shared/js/cr/ui', + 'files': [ + 'browser/resources/shared/js/cr/ui/array_data_model.js', + 'browser/resources/shared/js/cr/ui/command.js', + 'browser/resources/shared/js/cr/ui/context_menu_handler.js', + 'browser/resources/shared/js/cr/ui/list.js', + 'browser/resources/shared/js/cr/ui/list_item.js', + 'browser/resources/shared/js/cr/ui/list_selection_model.js', + 'browser/resources/shared/js/cr/ui/menu.js', + 'browser/resources/shared/js/cr/ui/menu_button.js', + 'browser/resources/shared/js/cr/ui/menu_item.js', + 'browser/resources/shared/js/cr/ui/position_util.js', + 'browser/resources/shared/js/cr/ui/splitter.js', + 'browser/resources/shared/js/cr/ui/tree.js', + ] + }, + ] + }, + { 'target_name': 'component_extensions', 'type': 'none', 'msvs_guid': '50B52703-525F-404C-BFE2-C46D3375D73E', |