Index: chrome/chrome_browser.gypi |
diff --git a/chrome/chrome_browser.gypi b/chrome/chrome_browser.gypi |
index e649a278bc50e68b8c497392f313a4dfb1c2959f..a1bca3c83543ac778aab0f4df88318512c5c1337 100644 |
--- a/chrome/chrome_browser.gypi |
+++ b/chrome/chrome_browser.gypi |
@@ -16,7 +16,6 @@ |
'chrome_strings', |
'chrome_version_info', |
'component_extensions', |
- 'domui_shared_resources', |
'platform_locale_settings', |
'profile_import', |
'browser/sync/protocol/sync_proto.gyp:sync_proto_cpp', |
@@ -1031,6 +1030,8 @@ |
'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', |
@@ -2707,8 +2708,9 @@ |
# These files are generated by GRIT. |
'<(grit_out_dir)/grit/bookmark_manager_resources_map.cc', |
- '<(grit_out_dir)/grit/theme_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', |
], |
'conditions': [ |
['javascript_engine=="v8"', { |
@@ -3402,76 +3404,6 @@ |
], |
}, |
{ |
- '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', |