summaryrefslogtreecommitdiffstats
path: root/chrome/browser/resources
diff options
context:
space:
mode:
Diffstat (limited to 'chrome/browser/resources')
-rw-r--r--chrome/browser/resources/bookmark_manager_resources.grd26
-rw-r--r--chrome/browser/resources/net_internals_resources.grd6
-rw-r--r--chrome/browser/resources/shared_resources.grd35
3 files changed, 37 insertions, 30 deletions
diff --git a/chrome/browser/resources/bookmark_manager_resources.grd b/chrome/browser/resources/bookmark_manager_resources.grd
index fb6b089..8a54565 100644
--- a/chrome/browser/resources/bookmark_manager_resources.grd
+++ b/chrome/browser/resources/bookmark_manager_resources.grd
@@ -6,27 +6,27 @@ without changes to the corresponding grd file. -->
<output filename="grit/bookmark_manager_resources.h" type="rc_header">
<emit emit_type='prepend'></emit>
</output>
- <output filename="grit/bookmark_manager_resources_map.cc" type="resource_file_map_source" />
- <output filename="grit/bookmark_manager_resources_map.h" type="resource_map_header" />
<output filename="bookmark_manager_resources.pak" type="data_package" />
+ <output filename="grit/bookmark_manager_resources_map.h" type="resource_map_header" />
+ <output filename="grit/bookmark_manager_resources_map.cc" type="resource_file_map_source" />
</outputs>
<release seq="1">
<includes>
+ <include name="IDR_BOOKMARK_MANAGER_TREE_ITERATOR_TEST" file="bookmark_manager/js/bmm/tree_iterator_test.html" type="BINDATA" />
+ <include name="IDR_BOOKMARK_MANAGER_BOOKMARK_TREE" file="bookmark_manager/js/bmm/bookmark_tree.js" type="BINDATA" />
+ <include name="IDR_BOOKMARK_MANAGER_TREE_ITERATOR" file="bookmark_manager/js/bmm/tree_iterator.js" type="BINDATA" />
+ <include name="IDR_BOOKMARK_MANAGER_BOOKMARK_LIST" file="bookmark_manager/js/bmm/bookmark_list.js" type="BINDATA" />
+ <include name="IDR_BOOKMARK_MANAGER_BMM_TEST" file="bookmark_manager/js/bmm_test.html" type="BINDATA" />
+ <include name="IDR_BOOKMARK_MANAGER_BMM_JS" file="bookmark_manager/js/bmm.js" type="BINDATA" />
+ <include name="IDR_BOOKMARK_MANAGER_MANIFEST_JSON" file="bookmark_manager/manifest.json" type="BINDATA" />
<include name="IDR_BOOKMARK_MANAGER_BMM_CSS" file="bookmark_manager/css/bmm.css" type="BINDATA" />
<include name="IDR_BOOKMARK_MANAGER_BMM_CSS_JS" file="bookmark_manager/css/bmm.css.js" type="BINDATA" />
- <include name="IDR_BOOKMARK_MANAGER_BMM_JS" file="bookmark_manager/js/bmm.js" type="BINDATA" />
- <include name="IDR_BOOKMARK_MANAGER_BMM_TEST" file="bookmark_manager/js/bmm_test.html" type="BINDATA" />
- <include name="IDR_BOOKMARK_MANAGER_BOOKMARK_LIST" file="bookmark_manager/js/bmm/bookmark_list.js" type="BINDATA" />
- <include name="IDR_BOOKMARK_MANAGER_BOOKMARK_MANAGER_RECENT" file="bookmark_manager/images/bookmark_manager_recent.png" type="BINDATA" />
+ <include name="IDR_BOOKMARK_MANAGER_MAIN" file="bookmark_manager/main.html" type="BINDATA" />
+ <include name="IDR_BOOKMARK_MANAGER_BOOKMARKS_SECTION_32" file="bookmark_manager/images/bookmarks_section_32.png" type="BINDATA" />
+ <include name="IDR_BOOKMARK_MANAGER_BOOKMARKS_SECTION" file="bookmark_manager/images/bookmarks_section.png" type="BINDATA" />
<include name="IDR_BOOKMARK_MANAGER_BOOKMARK_MANAGER_SEARCH" file="bookmark_manager/images/bookmark_manager_search.png" type="BINDATA" />
- <include name="IDR_BOOKMARK_MANAGER_BOOKMARK_TREE" file="bookmark_manager/js/bmm/bookmark_tree.js" type="BINDATA" />
<include name="IDR_BOOKMARK_MANAGER_BOOKMARKS_FAVICON" file="bookmark_manager/images/bookmarks_favicon.png" type="BINDATA" />
- <include name="IDR_BOOKMARK_MANAGER_BOOKMARKS_SECTION" file="bookmark_manager/images/bookmarks_section.png" type="BINDATA" />
- <include name="IDR_BOOKMARK_MANAGER_BOOKMARKS_SECTION_32" file="bookmark_manager/images/bookmarks_section_32.png" type="BINDATA" />
- <include name="IDR_BOOKMARK_MANAGER_MAIN" file="bookmark_manager/main.html" type="BINDATA" />
- <include name="IDR_BOOKMARK_MANAGER_MANIFEST_JSON" file="bookmark_manager/manifest.json" type="BINDATA" />
- <include name="IDR_BOOKMARK_MANAGER_TREE_ITERATOR" file="bookmark_manager/js/bmm/tree_iterator.js" type="BINDATA" />
- <include name="IDR_BOOKMARK_MANAGER_TREE_ITERATOR_TEST" file="bookmark_manager/js/bmm/tree_iterator_test.html" type="BINDATA" />
+ <include name="IDR_BOOKMARK_MANAGER_BOOKMARK_MANAGER_RECENT" file="bookmark_manager/images/bookmark_manager_recent.png" type="BINDATA" />
</includes>
</release>
</grit>
diff --git a/chrome/browser/resources/net_internals_resources.grd b/chrome/browser/resources/net_internals_resources.grd
index 93a73b7..2ed151a 100644
--- a/chrome/browser/resources/net_internals_resources.grd
+++ b/chrome/browser/resources/net_internals_resources.grd
@@ -6,9 +6,9 @@ without changes to the corresponding grd file. -->
<output filename="grit/net_internals_resources.h" type="rc_header">
<emit emit_type='prepend'></emit>
</output>
- <output filename="grit/net_internals_resources_map.cc" type="resource_file_map_source" />
- <output filename="grit/net_internals_resources_map.h" type="resource_map_header" />
<output filename="net_internals_resources.pak" type="data_package" />
+ <output filename="grit/net_internals_resources_map.h" type="resource_map_header" />
+ <output filename="grit/net_internals_resources_map.cc" type="resource_file_map_source" />
</outputs>
<release seq="1">
<includes>
@@ -19,8 +19,8 @@ without changes to the corresponding grd file. -->
<include name="IDR_NET_INTERNALS_INDEX_HTML" file="net_internals/index.html" type="BINDATA" />
<include name="IDR_NET_INTERNALS_LOGGROUPER" file="net_internals/loggrouper.js" type="BINDATA" />
<include name="IDR_NET_INTERNALS_LOGVIEWPAINTER" file="net_internals/logviewpainter.js" type="BINDATA" />
- <include name="IDR_NET_INTERNALS_MAIN" file="net_internals/main.js" type="BINDATA" />
<include name="IDR_NET_INTERNALS_MAIN_CSS" file="net_internals/main.css" type="BINDATA" />
+ <include name="IDR_NET_INTERNALS_MAIN" file="net_internals/main.js" type="BINDATA" />
<include name="IDR_NET_INTERNALS_PROXYVIEW" file="net_internals/proxyview.js" type="BINDATA" />
<include name="IDR_NET_INTERNALS_REQUESTSVIEW" file="net_internals/requestsview.js" type="BINDATA" />
<include name="IDR_NET_INTERNALS_RESIZABLEVERTICALSPLITVIEW" file="net_internals/resizableverticalsplitview.js" type="BINDATA" />
diff --git a/chrome/browser/resources/shared_resources.grd b/chrome/browser/resources/shared_resources.grd
index 12a8b4a..322b1c2 100644
--- a/chrome/browser/resources/shared_resources.grd
+++ b/chrome/browser/resources/shared_resources.grd
@@ -6,12 +6,13 @@ without changes to the corresponding grd file. paaaae -->
<output filename="grit/shared_resources.h" type="rc_header">
<emit emit_type='prepend'></emit>
</output>
- <output filename="grit/shared_resources_map.cc" type="resource_file_map_source" />
- <output filename="grit/shared_resources_map.h" type="resource_map_header" />
<output filename="shared_resources.pak" type="data_package" />
+ <output filename="grit/shared_resources_map.h" type="resource_map_header" />
+ <output filename="grit/shared_resources_map.cc" type="resource_file_map_source" />
</outputs>
<release seq="1">
<includes>
+ <!-- shared/css/ -->
<include name="IDR_SHARED_CSS_BUTTON"
file="shared/css/button.css" type="BINDATA" />
<include name="IDR_SHARED_CSS_LIST"
@@ -22,10 +23,22 @@ without changes to the corresponding grd file. paaaae -->
file="shared/css/tree.css" type="BINDATA" />
<include name="IDR_SHARED_CSS_TREE_JS"
file="shared/css/tree.css.js" type="BINDATA" />
+
+ <!-- shared/js/ -->
<include name="IDR_SHARED_JS_CLASS_LIST"
file="shared/js/class_list.js" type="BINDATA" />
<include name="IDR_SHARED_JS_CR"
file="shared/js/cr.js" type="BINDATA" />
+ <include name="IDR_SHARED_JS_I18N_TEMPLATE"
+ file="shared/js/i18n_template.js" type="BINDATA" />
+ <include name="IDR_SHARED_JS_LOCAL_STRINGS"
+ file="shared/js/local_strings.js" type="BINDATA" />
+ <include name="IDR_SHARED_JS_PARSE_HTML_SUBSET"
+ file="shared/js/parse_html_subset.js" type="BINDATA" />
+ <include name="IDR_SHARED_JS_UTIL"
+ file="shared/js/util.js" type="BINDATA" />
+
+ <!-- shared/js/cr -->
<include name="IDR_SHARED_JS_CR_EVENT_TARGET"
file="shared/js/cr/event_target.js" type="BINDATA" />
<include name="IDR_SHARED_JS_CR_LINK_CONTROLLER"
@@ -34,6 +47,8 @@ without changes to the corresponding grd file. paaaae -->
file="shared/js/cr/promise.js" type="BINDATA" />
<include name="IDR_SHARED_JS_CR_UI"
file="shared/js/cr/ui.js" type="BINDATA" />
+
+ <!-- shared/js/cr/ui -->
<include name="IDR_SHARED_JS_CR_UI_ARRAY_DATA_MODEL"
file="shared/js/cr/ui/array_data_model.js" type="BINDATA" />
<include name="IDR_SHARED_JS_CR_UI_COMMAND"
@@ -42,32 +57,24 @@ without changes to the corresponding grd file. paaaae -->
file="shared/js/cr/ui/context_menu_button.js" type="BINDATA" />
<include name="IDR_SHARED_JS_CR_UI_CONTEXT_MENU_HANDLER"
file="shared/js/cr/ui/context_menu_handler.js" type="BINDATA" />
- <include name="IDR_SHARED_JS_CR_UI_LIST"
- file="shared/js/cr/ui/list.js" type="BINDATA" />
<include name="IDR_SHARED_JS_CR_UI_LIST_ITEM"
file="shared/js/cr/ui/list_item.js" type="BINDATA" />
+ <include name="IDR_SHARED_JS_CR_UI_LIST"
+ file="shared/js/cr/ui/list.js" type="BINDATA" />
<include name="IDR_SHARED_JS_CR_UI_LIST_SELECTION_MODEL"
file="shared/js/cr/ui/list_selection_model.js" type="BINDATA" />
- <include name="IDR_SHARED_JS_CR_UI_MENU"
- file="shared/js/cr/ui/menu.js" type="BINDATA" />
<include name="IDR_SHARED_JS_CR_UI_MENU_BUTTON"
file="shared/js/cr/ui/menu_button.js" type="BINDATA" />
<include name="IDR_SHARED_JS_CR_UI_MENU_ITEM"
file="shared/js/cr/ui/menu_item.js" type="BINDATA" />
+ <include name="IDR_SHARED_JS_CR_UI_MENU"
+ file="shared/js/cr/ui/menu.js" type="BINDATA" />
<include name="IDR_SHARED_JS_CR_UI_POSITION_UTIL"
file="shared/js/cr/ui/position_util.js" type="BINDATA" />
<include name="IDR_SHARED_JS_CR_UI_SPLITTER"
file="shared/js/cr/ui/splitter.js" type="BINDATA" />
<include name="IDR_SHARED_JS_CR_UI_TREE"
file="shared/js/cr/ui/tree.js" type="BINDATA" />
- <include name="IDR_SHARED_JS_I18N_TEMPLATE"
- file="shared/js/i18n_template.js" type="BINDATA" />
- <include name="IDR_SHARED_JS_LOCAL_STRINGS"
- file="shared/js/local_strings.js" type="BINDATA" />
- <include name="IDR_SHARED_JS_PARSE_HTML_SUBSET"
- file="shared/js/parse_html_subset.js" type="BINDATA" />
- <include name="IDR_SHARED_JS_UTIL"
- file="shared/js/util.js" type="BINDATA" />
</includes>
</release>
</grit>