| Index: ui/webui/resources/webui_resources.grd
|
| diff --git a/ui/webui/resources/webui_resources.grd b/ui/webui/resources/webui_resources.grd
|
| index 4f0752c8156351a55e3c2624c1558a23419a7f19..1348ad0c3d2b3097aa9779906796e8234fd0e54c 100644
|
| --- a/ui/webui/resources/webui_resources.grd
|
| +++ b/ui/webui/resources/webui_resources.grd
|
| @@ -257,30 +257,71 @@ without changes to the corresponding grd file. -->
|
| <structure name="IDR_WEBUI_CSS_WIDGETS"
|
| file="css/widgets.css" type="chrome_html"
|
| flattenhtml="true" />
|
| +
|
| + <structure name="IDR_WEBUI_HTML_ACTION_LINK"
|
| + file="html/action_link.html" type="chrome_html" />
|
| + <structure name="IDR_WEBUI_HTML_ASSERT"
|
| + file="html/assert.html" type="chrome_html" />
|
| + <structure name="IDR_WEBUI_HTML_CR"
|
| + file="html/cr.html" type="chrome_html" />
|
| + <structure name="IDR_WEBUI_HTML_CR_EVENT_TARGET"
|
| + file="html/cr/event_target.html" type="chrome_html" />
|
| + <structure name="IDR_WEBUI_HTML_CR_UI"
|
| + file="html/cr/ui.html" type="chrome_html" />
|
| + <structure name="IDR_WEBUI_HTML_CR_UI_ALERT_OVERLAY"
|
| + file="html/cr/ui/alert_overlay.html" type="chrome_html" />
|
| + <structure name="IDR_WEBUI_HTML_CR_UI_COMMAND"
|
| + file="html/cr/ui/command.html" type="chrome_html" />
|
| + <structure name="IDR_WEBUI_HTML_CR_UI_CONTEXT_MENU_BUTTON"
|
| + file="html/cr/ui/context_menu_button.html"
|
| + type="chrome_html" />
|
| + <structure name="IDR_WEBUI_HTML_CR_UI_CONTEXT_MENU_HANDLER"
|
| + file="html/cr/ui/context_menu_handler.html"
|
| + type="chrome_html" />
|
| + <structure name="IDR_WEBUI_HTML_CR_UI_FOCUS_GRID"
|
| + file="html/cr/ui/focus_grid.html" type="chrome_html" />
|
| + <structure name="IDR_WEBUI_HTML_CR_UI_FOCUS_MANAGER"
|
| + file="html/cr/ui/focus_manager.html" type="chrome_html" />
|
| + <structure name="IDR_WEBUI_HTML_CR_UI_FOCUS_OUTLINE_MANAGER"
|
| + file="html/cr/ui/focus_outline_manager.html"
|
| + type="chrome_html" />
|
| + <structure name="IDR_WEBUI_HTML_CR_UI_FOCUS_ROW"
|
| + file="html/cr/ui/focus_row.html" type="chrome_html" />
|
| + <structure name="IDR_WEBUI_HTML_CR_UI_MENU"
|
| + file="html/cr/ui/menu.html" type="chrome_html" />
|
| + <structure name="IDR_WEBUI_HTML_CR_UI_MENU_BUTTON"
|
| + file="html/cr/ui/menu_button.html" type="chrome_html" />
|
| + <structure name="IDR_WEBUI_HTML_CR_UI_MENU_ITEM"
|
| + file="html/cr/ui/menu_item.html" type="chrome_html" />
|
| + <structure name="IDR_WEBUI_HTML_CR_UI_OVERLAY"
|
| + file="html/cr/ui/overlay.html" type="chrome_html" />
|
| + <structure name="IDR_WEBUI_HTML_CR_UI_POSITION_UTIL"
|
| + file="html/cr/ui/position_util.html" type="chrome_html" />
|
| + <structure name="IDR_WEBUI_HTML_EVENT_TRACKER"
|
| + file="html/event_tracker.html" type="chrome_html" />
|
| + <structure name="IDR_WEBUI_HTML_I18N_TEMPLATE"
|
| + file="html/i18n_template.html" type="chrome_html" />
|
| + <structure name="IDR_WEBUI_HTML_LOAD_TIME_DATA"
|
| + file="html/load_time_data.html" type="chrome_html" />
|
| + <structure name="IDR_WEBUI_HTML_POLYMER_CONFIG"
|
| + file="html/polymer_config.html" type="chrome_html" />
|
| + <structure name="IDR_WEBUI_HTML_UTIL"
|
| + file="html/util.html" type="chrome_html" />
|
| +
|
| <structure name="IDR_WEBUI_JS_ACTION_LINK"
|
| file="js/action_link.js" type="chrome_html" />
|
| <structure name="IDR_WEBUI_JS_ASSERT"
|
| file="js/assert.js" type="chrome_html" />
|
| - <structure name="IDR_WEBUI_HTML_ASSERT"
|
| - file="html/assert.html" type="chrome_html" />
|
| <structure name="IDR_WEBUI_JS_CR"
|
| file="js/cr.js" type="chrome_html" />
|
| - <structure name="IDR_WEBUI_HTML_CR"
|
| - file="html/cr.html" type="chrome_html" />
|
| <structure name="IDR_WEBUI_JS_CR_EVENT_TARGET"
|
| file="js/cr/event_target.js" type="chrome_html" />
|
| - <structure name="IDR_WEBUI_HTML_CR_EVENT_TARGET"
|
| - file="html/cr/event_target.html" type="chrome_html" />
|
| <structure name="IDR_WEBUI_JS_CR_LINK_CONTROLLER"
|
| file="js/cr/link_controller.js" type="chrome_html" />
|
| <structure name="IDR_WEBUI_JS_CR_UI"
|
| file="js/cr/ui.js" type="chrome_html" />
|
| - <structure name="IDR_WEBUI_HTML_CR_UI"
|
| - file="html/cr/ui.html" type="chrome_html" />
|
| <structure name="IDR_WEBUI_JS_CR_UI_ALERT_OVERLAY"
|
| file="js/cr/ui/alert_overlay.js" type="chrome_html" />
|
| - <structure name="IDR_WEBUI_HTML_CR_UI_ALERT_OVERLAY"
|
| - file="html/cr/ui/alert_overlay.html" type="chrome_html" />
|
| <structure name="IDR_WEBUI_JS_CR_UI_ARRAY_DATA_MODEL"
|
| file="js/cr/ui/array_data_model.js"
|
| type="chrome_html" flattenhtml="true" />
|
| @@ -295,20 +336,12 @@ without changes to the corresponding grd file. -->
|
| file="js/cr/ui/card_slider.js" type="chrome_html" />
|
| <structure name="IDR_WEBUI_JS_CR_UI_COMMAND"
|
| file="js/cr/ui/command.js" type="chrome_html" />
|
| - <structure name="IDR_WEBUI_HTML_CR_UI_COMMAND"
|
| - file="html/cr/ui/command.html" type="chrome_html" />
|
| <structure name="IDR_WEBUI_JS_CR_UI_CONTEXT_MENU_BUTTON"
|
| file="js/cr/ui/context_menu_button.js"
|
| type="chrome_html" />
|
| - <structure name="IDR_WEBUI_HTML_CR_UI_CONTEXT_MENU_BUTTON"
|
| - file="html/cr/ui/context_menu_button.html"
|
| - type="chrome_html" />
|
| <structure name="IDR_WEBUI_JS_CR_UI_CONTEXT_MENU_HANDLER"
|
| file="js/cr/ui/context_menu_handler.js"
|
| type="chrome_html" />
|
| - <structure name="IDR_WEBUI_HTML_CR_UI_CONTEXT_MENU_HANDLER"
|
| - file="html/cr/ui/context_menu_handler.html"
|
| - type="chrome_html" />
|
| <structure name="IDR_WEBUI_JS_CR_UI_CONTROLLED_INDICATOR"
|
| file="js/cr/ui/controlled_indicator.js" type="chrome_html" />
|
| <structure name="IDR_WEBUI_JS_CR_UI_DIALOGS"
|
| @@ -317,22 +350,13 @@ without changes to the corresponding grd file. -->
|
| file="js/cr/ui/drag_wrapper.js" type="chrome_html" />
|
| <structure name="IDR_WEBUI_JS_CR_UI_FOCUS_GRID"
|
| file="js/cr/ui/focus_grid.js" type="chrome_html" />
|
| - <structure name="IDR_WEBUI_HTML_CR_UI_FOCUS_GRID"
|
| - file="html/cr/ui/focus_grid.html" type="chrome_html" />
|
| <structure name="IDR_WEBUI_JS_CR_UI_FOCUS_MANAGER"
|
| file="js/cr/ui/focus_manager.js" type="chrome_html" />
|
| - <structure name="IDR_WEBUI_HTML_CR_UI_FOCUS_MANAGER"
|
| - file="html/cr/ui/focus_manager.html" type="chrome_html" />
|
| <structure name="IDR_WEBUI_JS_CR_UI_FOCUS_OUTLINE_MANAGER"
|
| file="js/cr/ui/focus_outline_manager.js"
|
| type="chrome_html" />
|
| - <structure name="IDR_WEBUI_HTML_CR_UI_FOCUS_OUTLINE_MANAGER"
|
| - file="html/cr/ui/focus_outline_manager.html"
|
| - type="chrome_html" />
|
| <structure name="IDR_WEBUI_JS_CR_UI_FOCUS_ROW"
|
| file="js/cr/ui/focus_row.js" type="chrome_html" />
|
| - <structure name="IDR_WEBUI_HTML_CR_UI_FOCUS_ROW"
|
| - file="html/cr/ui/focus_row.html" type="chrome_html" />
|
| <structure name="IDR_WEBUI_JS_CR_UI_LIST"
|
| file="js/cr/ui/list.js" type="chrome_html" />
|
| <structure name="IDR_WEBUI_JS_CR_UI_LIST_ITEM"
|
| @@ -348,22 +372,14 @@ without changes to the corresponding grd file. -->
|
| type="chrome_html" />
|
| <structure name="IDR_WEBUI_JS_CR_UI_MENU"
|
| file="js/cr/ui/menu.js" type="chrome_html" />
|
| - <structure name="IDR_WEBUI_HTML_CR_UI_MENU"
|
| - file="html/cr/ui/menu.html" type="chrome_html" />
|
| <structure name="IDR_WEBUI_JS_CR_UI_MENU_BUTTON"
|
| file="js/cr/ui/menu_button.js" type="chrome_html" />
|
| - <structure name="IDR_WEBUI_HTML_CR_UI_MENU_BUTTON"
|
| - file="html/cr/ui/menu_button.html" type="chrome_html" />
|
| <structure name="IDR_WEBUI_JS_CR_UI_MENU_ITEM"
|
| file="js/cr/ui/menu_item.js" type="chrome_html" />
|
| - <structure name="IDR_WEBUI_HTML_CR_UI_MENU_ITEM"
|
| - file="html/cr/ui/menu_item.html" type="chrome_html" />
|
| <structure name="IDR_WEBUI_JS_CR_UI_NODE_UTILS"
|
| file="js/cr/ui/node_utils.js" type="chrome_html" />
|
| <structure name="IDR_WEBUI_JS_CR_UI_OVERLAY"
|
| file="js/cr/ui/overlay.js" type="chrome_html" />
|
| - <structure name="IDR_WEBUI_HTML_CR_UI_OVERLAY"
|
| - file="html/cr/ui/overlay.html" type="chrome_html" />
|
| <structure name="IDR_WEBUI_JS_CR_UI_PAGE_MANAGER_PAGE"
|
| file="js/cr/ui/page_manager/page.js" type="chrome_html"
|
| flattenhtml="true" />
|
| @@ -371,8 +387,6 @@ without changes to the corresponding grd file. -->
|
| file="js/cr/ui/page_manager/page_manager.js" type="chrome_html" />
|
| <structure name="IDR_WEBUI_JS_CR_UI_POSITION_UTIL"
|
| file="js/cr/ui/position_util.js" type="chrome_html" />
|
| - <structure name="IDR_WEBUI_HTML_CR_UI_POSITION_UTIL"
|
| - file="html/cr/ui/position_util.html" type="chrome_html" />
|
| <structure name="IDR_WEBUI_JS_CR_UI_SPLITTER"
|
| file="js/cr/ui/splitter.js" type="chrome_html" />
|
| <structure name="IDR_WEBUI_JS_CR_UI_GRID"
|
| @@ -405,15 +419,11 @@ without changes to the corresponding grd file. -->
|
| file="js/cr/ui/touch_handler.js" type="chrome_html" />
|
| <structure name="IDR_WEBUI_JS_EVENT_TRACKER"
|
| file="js/event_tracker.js" type="chrome_html" />
|
| - <structure name="IDR_WEBUI_HTML_EVENT_TRACKER"
|
| - file="html/event_tracker.html" type="chrome_html" />
|
| <structure name="IDR_WEBUI_JS_I18N_TEMPLATE_NO_PROCESS"
|
| file="js/i18n_template_no_process.js"
|
| type="chrome_html" />
|
| <structure name="IDR_WEBUI_JS_LOAD_TIME_DATA"
|
| file="js/load_time_data.js" type="chrome_html" />
|
| - <structure name="IDR_WEBUI_HTML_LOAD_TIME_DATA"
|
| - file="html/load_time_data.html" type="chrome_html" />
|
| <structure name="IDR_WEBUI_JS_MEDIA_COMMON"
|
| file="js/media_common.js" type="chrome_html" />
|
| <structure name="IDR_WEBUI_JS_PARSE_HTML_SUBSET"
|
| @@ -422,12 +432,8 @@ without changes to the corresponding grd file. -->
|
| file="js/polymer_config.js" type="chrome_html" />
|
| <structure name="IDR_WEBUI_JS_UTIL"
|
| file="js/util.js" type="chrome_html" flattenhtml="true" />
|
| - <structure name="IDR_WEBUI_HTML_UTIL"
|
| - file="html/util.html" type="chrome_html" />
|
| <structure name="IDR_WEBUI_JS_WEBUI_RESOURCE_TEST"
|
| file="js/webui_resource_test.js" type="chrome_html" />
|
| - <structure name="IDR_WEBUI_HTML_ACTION_LINK"
|
| - file="html/action_link.html" type="chrome_html" />
|
| <if expr="chromeos">
|
| <structure name="IDR_WEBUI_CSS_UI_ACCOUNT_TWEAKS"
|
| file="css/chromeos/ui_account_tweaks.css"
|
|
|