Skip to content

GitLab

T
tangled
Commit 134fd646 authored by dpapad's avatar dpapad Committed by Commit Bot
Browse files
Options

Bookmarks WebUI cleanup: Convert unnecessary absolute URLs to relative. 

Also change GRIT configuration from flattenhtml to preprocess where possible.

Bug: 866236
Change-Id: Ief42c461cc6b61d2a3719e823c261053d2bf205d
Reviewed-on: https://chromium-review.googlesource.com/c/1383395
Commit-Queue: Demetrios Papadopoulos <dpapad@chromium.org>
Reviewed-by: default avatarcalamity <calamity@chromium.org>
Cr-Commit-Position: refs/heads/master@{#618273}
parent 1f289827
Hide whitespace changes
Inline Side-by-side
Showing with 73 additions and 73 deletions
chrome/browser/browser_resources.grd
View file @ 134fd646
......@@ -264,16 +264,16 @@
<include name="IDR_MD_BOOKMARKS_IMAGES_FOLDER_SVG" file="resources\md_bookmarks\images\folder.svg" type="BINDATA" />
<if expr="optimize_webui">
<then>
<include name="IDR_MD_BOOKMARKS_VULCANIZED_HTML" file="${root_gen_dir}\chrome\browser\resources\md_bookmarks\vulcanized.html" use_base_dir="false" flattenhtml="true" allowexternalscript="true" type="BINDATA" compress="gzip" />
<include name="IDR_MD_BOOKMARKS_VULCANIZED_P2_HTML" file="${root_gen_dir}\chrome\browser\resources\md_bookmarks\vulcanized.p2.html" use_base_dir="false" flattenhtml="true" allowexternalscript="true" type="BINDATA" compress="gzip" />
<include name="IDR_MD_BOOKMARKS_CRISPER_JS" file="${root_gen_dir}\chrome\browser\resources\md_bookmarks\crisper.js" use_base_dir="false" flattenhtml="true" type="BINDATA" compress="gzip" />
<include name="IDR_MD_BOOKMARKS_VULCANIZED_HTML" file="${root_gen_dir}\chrome\browser\resources\md_bookmarks\vulcanized.html" use_base_dir="false" preprocess="true" type="BINDATA" compress="gzip" />
<include name="IDR_MD_BOOKMARKS_VULCANIZED_P2_HTML" file="${root_gen_dir}\chrome\browser\resources\md_bookmarks\vulcanized.p2.html" use_base_dir="false" preprocess="true" type="BINDATA" compress="gzip" />
<include name="IDR_MD_BOOKMARKS_CRISPER_JS" file="${root_gen_dir}\chrome\browser\resources\md_bookmarks\crisper.js" use_base_dir="false" preprocess="true" type="BINDATA" compress="gzip" />
</then>
<else>
<include name="IDR_MD_BOOKMARKS_ACTIONS_HTML" file="resources\md_bookmarks\actions.html" type="BINDATA" />
<include name="IDR_MD_BOOKMARKS_ACTIONS_JS" file="resources\md_bookmarks\actions.js" type="BINDATA" />
<include name="IDR_MD_BOOKMARKS_API_LISTENER_HTML" file="resources\md_bookmarks\api_listener.html" type="BINDATA" />
<include name="IDR_MD_BOOKMARKS_API_LISTENER_JS" file="resources\md_bookmarks\api_listener.js" type="BINDATA" />
<include name="IDR_MD_BOOKMARKS_APP_HTML" file="resources\md_bookmarks\app.html" type="BINDATA" flattenhtml="true" />
<include name="IDR_MD_BOOKMARKS_APP_HTML" file="resources\md_bookmarks\app.html" type="BINDATA" preprocess="true" />
<include name="IDR_MD_BOOKMARKS_APP_JS" file="resources\md_bookmarks\app.js" type="BINDATA" />
<include name="IDR_MD_BOOKMARKS_BOOKMARKS_HTML" file="resources\md_bookmarks\bookmarks.html" type="BINDATA" />
<include name="IDR_MD_BOOKMARKS_COMMAND_MANAGER_HTML" file="resources\md_bookmarks\command_manager.html" type="BINDATA" />
......
chrome/browser/resources/md_bookmarks/actions.html
View file @ 134fd646
<link rel="import" href="chrome://resources/html/cr.html">
<script src="chrome://bookmarks/actions.js"></script>
<script src="actions.js"></script>
chrome/browser/resources/md_bookmarks/api_listener.html
View file @ 134fd646
<link rel="import" href="chrome://resources/html/cr.html">
<link rel="import" href="chrome://bookmarks/actions.html">
<link rel="import" href="chrome://bookmarks/debouncer.html">
<link rel="import" href="chrome://bookmarks/store.html">
<link rel="import" href="chrome://bookmarks/util.html">
<script src="chrome://bookmarks/api_listener.js"></script>
<link rel="import" href="actions.html">
<link rel="import" href="debouncer.html">
<link rel="import" href="store.html">
<link rel="import" href="util.html">
<script src="api_listener.js"></script>
chrome/browser/resources/md_bookmarks/app.html
View file @ 134fd646
......@@ -2,19 +2,19 @@
<link rel="import" href="chrome://resources/cr_elements/shared_vars_css.html">
<link rel="import" href="chrome://resources/html/cr/ui/splitter.html">
<link rel="import" href="chrome://bookmarks/api_listener.html">
<link rel="import" href="chrome://bookmarks/command_manager.html">
<link rel="import" href="chrome://bookmarks/constants.html">
<link rel="import" href="chrome://bookmarks/dnd_manager.html">
<link rel="import" href="chrome://bookmarks/folder_node.html">
<link rel="import" href="chrome://bookmarks/list.html">
<link rel="import" href="chrome://bookmarks/mouse_focus_behavior.html">
<link rel="import" href="chrome://bookmarks/router.html">
<link rel="import" href="chrome://bookmarks/shared_vars.html">
<link rel="import" href="chrome://bookmarks/store.html">
<link rel="import" href="chrome://bookmarks/toast_manager.html">
<link rel="import" href="chrome://bookmarks/toolbar.html">
<link rel="import" href="chrome://bookmarks/util.html">
<link rel="import" href="api_listener.html">
<link rel="import" href="command_manager.html">
<link rel="import" href="constants.html">
<link rel="import" href="dnd_manager.html">
<link rel="import" href="folder_node.html">
<link rel="import" href="list.html">
<link rel="import" href="mouse_focus_behavior.html">
<link rel="import" href="router.html">
<link rel="import" href="shared_vars.html">
<link rel="import" href="store.html">
<link rel="import" href="toast_manager.html">
<link rel="import" href="toolbar.html">
<link rel="import" href="util.html">
<dom-module id="bookmarks-app">
<template>
......@@ -80,5 +80,5 @@
<bookmarks-command-manager></bookmarks-command-manager>
<bookmarks-toast-manager duration="10000"></bookmarks-toast-manager>
</template>
<script src="chrome://bookmarks/app.js"></script>
<script src="app.js"></script>
</dom-module>
chrome/browser/resources/md_bookmarks/bookmarks.html
View file @ 134fd646
......@@ -24,8 +24,8 @@
<bookmarks-app></bookmarks-app>
<script src="chrome://resources/js/load_time_data.js"></script>
<script src="chrome://bookmarks/strings.js"></script>
<link rel="import" href="chrome://bookmarks/app.html">
<script src="strings.js"></script>
<link rel="import" href="app.html">
<link rel="import" href="chrome://resources/html/dark_mode.html">
</body>
</html>
chrome/browser/resources/md_bookmarks/command_manager.html
View file @ 134fd646
......@@ -6,10 +6,10 @@
<link rel="import" href="chrome://resources/cr_elements/shared_vars_css.html">
<link rel="import" href="chrome://resources/html/cr/ui/command.html">
<link rel="import" href="chrome://resources/polymer/v1_0/iron-a11y-keys-behavior/iron-a11y-keys-behavior.html">
<link rel="import" href="chrome://bookmarks/dialog_focus_manager.html">
<link rel="import" href="chrome://bookmarks/edit_dialog.html">
<link rel="import" href="chrome://bookmarks/shared_style.html">
<link rel="import" href="chrome://bookmarks/store_client.html">
<link rel="import" href="dialog_focus_manager.html">
<link rel="import" href="edit_dialog.html">
<link rel="import" href="shared_style.html">
<link rel="import" href="store_client.html">
<dom-module id="bookmarks-command-manager">
<template>
......@@ -73,5 +73,5 @@
</template>
</cr-lazy-render>
</template>
<script src="chrome://bookmarks/command_manager.js"></script>
<script src="command_manager.js"></script>
</dom-module>
chrome/browser/resources/md_bookmarks/constants.html
View file @ 134fd646
<script src="chrome://bookmarks/constants.js"></script>
<script src="constants.js"></script>
chrome/browser/resources/md_bookmarks/debouncer.html
View file @ 134fd646
<link rel="import" href="chrome://resources/html/cr.html">
<script src="chrome://bookmarks/debouncer.js"></script>
<script src="debouncer.js"></script>
chrome/browser/resources/md_bookmarks/dialog_focus_manager.html
View file @ 134fd646
<link rel="import" href="chrome://resources/html/cr.html">
<script src="chrome://bookmarks/dialog_focus_manager.js"></script>
<script src="dialog_focus_manager.js"></script>
chrome/browser/resources/md_bookmarks/dnd_manager.html
View file @ 134fd646
<link rel="import" href="chrome://bookmarks/constants.html">
<link rel="import" href="chrome://bookmarks/debouncer.html">
<script src="chrome://bookmarks/dnd_manager.js"></script>
<link rel="import" href="constants.html">
<link rel="import" href="debouncer.html">
<script src="dnd_manager.js"></script>
chrome/browser/resources/md_bookmarks/edit_dialog.html
View file @ 134fd646
......@@ -6,7 +6,7 @@
<link rel="import" href="chrome://resources/cr_elements/paper_button_style_css.html">
<link rel="import" href="chrome://resources/cr_elements/shared_style_css.html">
<link rel="import" href="chrome://resources/polymer/v1_0/paper-button/paper-button.html">
<link rel="import" href="chrome://bookmarks/dialog_focus_manager.html">
<link rel="import" href="dialog_focus_manager.html">
<dom-module id="bookmarks-edit-dialog">
<template>
......@@ -36,5 +36,5 @@
</div>
</cr-dialog>
</template>
<script src="chrome://bookmarks/edit_dialog.js"></script>
<script src="edit_dialog.js"></script>
</dom-module>
chrome/browser/resources/md_bookmarks/folder_node.html
View file @ 134fd646
......@@ -4,10 +4,10 @@
<link rel="import" href="chrome://resources/cr_elements/shared_vars_css.html">
<link rel="import" href="chrome://resources/polymer/v1_0/iron-icon/iron-icon.html">
<link rel="import" href="chrome://resources/polymer/v1_0/paper-icon-button/paper-icon-button-light.html">
<link rel="import" href="chrome://bookmarks/actions.html">
<link rel="import" href="chrome://bookmarks/command_manager.html">
<link rel="import" href="chrome://bookmarks/shared_style.html">
<link rel="import" href="chrome://bookmarks/store_client.html">
<link rel="import" href="actions.html">
<link rel="import" href="command_manager.html">
<link rel="import" href="shared_style.html">
<link rel="import" href="store_client.html">
<dom-module id="bookmarks-folder-node">
<template>
......@@ -119,5 +119,5 @@
</template>
</div>
</template>
<script src="chrome://bookmarks/folder_node.js"></script>
<script src="folder_node.js"></script>
</dom-module>
chrome/browser/resources/md_bookmarks/item.html
View file @ 134fd646
......@@ -3,9 +3,9 @@
<link rel="import" href="chrome://resources/cr_elements/shared_vars_css.html">
<link rel="import" href="chrome://resources/html/icon.html">
<link rel="import" href="chrome://resources/polymer/v1_0/paper-icon-button/paper-icon-button-light.html">
<link rel="import" href="chrome://bookmarks/actions.html">
<link rel="import" href="chrome://bookmarks/shared_style.html">
<link rel="import" href="chrome://bookmarks/store_client.html">
<link rel="import" href="actions.html">
<link rel="import" href="shared_style.html">
<link rel="import" href="store_client.html">
<dom-module id="bookmarks-item">
<template>
......@@ -83,5 +83,5 @@
</button>
</paper-icon-button-light>
</template>
<script src="chrome://bookmarks/item.js"></script>
<script src="item.js"></script>
</dom-module>
chrome/browser/resources/md_bookmarks/list.html
View file @ 134fd646
......@@ -3,11 +3,11 @@
<link rel="import" href="chrome://resources/cr_elements/shared_vars_css.html">
<link rel="import" href="chrome://resources/polymer/v1_0/iron-a11y-announcer/iron-a11y-announcer.html">
<link rel="import" href="chrome://resources/polymer/v1_0/iron-list/iron-list.html">
<link rel="import" href="chrome://bookmarks/command_manager.html">
<link rel="import" href="chrome://bookmarks/item.html">
<link rel="import" href="chrome://bookmarks/shared_style.html">
<link rel="import" href="chrome://bookmarks/store_client.html">
<link rel="import" href="chrome://bookmarks/util.html">
<link rel="import" href="command_manager.html">
<link rel="import" href="item.html">
<link rel="import" href="shared_style.html">
<link rel="import" href="store_client.html">
<link rel="import" href="util.html">
<link rel="import" href="chrome://resources/html/list_property_update_behavior.html">
<dom-module id="bookmarks-list">
......@@ -61,5 +61,5 @@
[[emptyListMessage_(searchTerm_)]]
</div>
</template>
<script src="chrome://bookmarks/list.js"></script>
<script src="list.js"></script>
</dom-module>
chrome/browser/resources/md_bookmarks/mouse_focus_behavior.html
View file @ 134fd646
<script src="chrome://bookmarks/mouse_focus_behavior.js"></script>
<script src="mouse_focus_behavior.js"></script>
chrome/browser/resources/md_bookmarks/reducers.html
View file @ 134fd646
<link rel="import" href="chrome://resources/html/cr.html">
<link rel="import" href="chrome://bookmarks/constants.html">
<script src="chrome://bookmarks/reducers.js"></script>
<link rel="import" href="constants.html">
<script src="reducers.js"></script>
chrome/browser/resources/md_bookmarks/router.html
View file @ 134fd646
......@@ -2,8 +2,8 @@
<link rel="import" href="chrome://resources/polymer/v1_0/iron-location/iron-location.html">
<link rel="import" href="chrome://resources/polymer/v1_0/iron-location/iron-query-params.html">
<link rel="import" href="chrome://bookmarks/actions.html">
<link rel="import" href="chrome://bookmarks/store_client.html">
<link rel="import" href="actions.html">
<link rel="import" href="store_client.html">
<dom-module id="bookmarks-router">
<template>
......@@ -11,5 +11,5 @@
<iron-query-params params-string="{{query_}}"
params-object="{{queryParams_}}"></iron-query-params>
</template>
<script src="chrome://bookmarks/router.js"></script>
<script src="router.js"></script>
</dom-module>
chrome/browser/resources/md_bookmarks/shared_style.html
View file @ 134fd646
<link rel="import" href="chrome://bookmarks/shared_vars.html">
<link rel="import" href="shared_vars.html">
<link rel="import" href="chrome://resources/cr_elements/shared_style_css.html">
<link rel="import" href="chrome://resources/cr_elements/shared_vars_css.html">
......@@ -61,7 +61,7 @@
}
.folder-icon {
background-image: url(chrome://bookmarks/images/folder.svg);
background-image: url(images/folder.svg);
background-size: contain;
height: 20px;
min-width: 20px;
......@@ -69,7 +69,7 @@
}
.folder-icon[open] {
background-image: url(chrome://bookmarks/images/folder_open.svg);
background-image: url(images/folder_open.svg);
}
.website-icon {
......
chrome/browser/resources/md_bookmarks/store.html
View file @ 134fd646
<link rel="import" href="chrome://resources/html/cr.html">
<link rel="import" href="chrome://resources/html/cr/ui/store.html">
<link rel="import" href="chrome://bookmarks/reducers.html">
<link rel="import" href="chrome://bookmarks/util.html">
<script src="chrome://bookmarks/store.js"></script>
<link rel="import" href="reducers.html">
<link rel="import" href="util.html">
<script src="store.js"></script>
chrome/browser/resources/md_bookmarks/store_client.html
View file @ 134fd646
<link rel="import" href="chrome://resources/html/cr.html">
<link rel="import" href="chrome://resources/html/cr/ui/store_client.html">
<link rel="import" href="chrome://bookmarks/store.html">
<link rel="import" href="store.html">
<script src="chrome://bookmarks/store_client.js"></script>
<script src="store_client.js"></script>
chrome/browser/resources/md_bookmarks/toast_manager.html
View file @ 134fd646
......@@ -3,7 +3,7 @@
<link rel="import" href="chrome://resources/polymer/v1_0/paper-button/paper-button.html">
<link rel="import" href="chrome://resources/cr_elements/cr_toast/cr_toast.html">
<link rel="import" href="chrome://resources/cr_elements/paper_button_style_css.html">
<link rel="import" href="chrome://bookmarks/shared_style.html">
<link rel="import" href="shared_style.html">
<dom-module id="bookmarks-toast-manager">
<template>
......@@ -33,5 +33,5 @@
</paper-button>
</cr-toast>
</template>
<script src="chrome://bookmarks/toast_manager.js"></script>
<script src="toast_manager.js"></script>
</dom-module>
chrome/browser/resources/md_bookmarks/toolbar.html
View file @ 134fd646
......@@ -3,7 +3,7 @@
<link rel="import" href="chrome://resources/cr_elements/cr_toolbar/cr_toolbar.html">
<link rel="import" href="chrome://resources/cr_elements/cr_toolbar/cr_toolbar_selection_overlay.html">
<link rel="import" href="chrome://resources/polymer/v1_0/paper-icon-button/paper-icon-button-light.html">
<link rel="import" href="chrome://bookmarks/shared_style.html">
<link rel="import" href="shared_style.html">
<dom-module id="bookmarks-toolbar">
<template>
......@@ -60,5 +60,5 @@
on-clear-selected-items="onClearSelectionTap_">
</cr-toolbar-selection-overlay>
</template>
<script src="chrome://bookmarks/toolbar.js"></script>
<script src="toolbar.js"></script>
</dom-module>
chrome/browser/resources/md_bookmarks/util.html
View file @ 134fd646
<link rel="import" href="chrome://resources/html/cr.html">
<script src="chrome://bookmarks/util.js"></script>
<script src="util.js"></script>
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment