Commit 1a83b9de authored by flackr@chromium.org's avatar flackr@chromium.org

Add high dpi folder icons.

BUG=129203
TEST=Run chrome with --force-device-scale-factor=2 and go to bookmark manager, folder icons are high dpi.

Review URL: https://chromiumcodereview.appspot.com/10855106

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@151258 0039d316-1c4b-4281-b951-d872f2087c98
parent dc0bf565
...@@ -68,8 +68,9 @@ html[dir=rtl] list .label { ...@@ -68,8 +68,9 @@ html[dir=rtl] list .label {
} }
list > .folder > .label { list > .folder > .label {
background-image: background-image: -webkit-image-set(
url('../../../../../ui/resources/default_100_percent/folder_closed.png'); url('../../../../../ui/resources/default_100_percent/common/folder_closed.png') 1x,
url('../../../../../ui/resources/default_200_percent/common/folder_closed.png') 2x);
} }
/* We need to ensure that even empty labels take up space */ /* We need to ensure that even empty labels take up space */
...@@ -172,8 +173,9 @@ list [editing] .url { ...@@ -172,8 +173,9 @@ list [editing] .url {
/* end editing */ /* end editing */
html[dir=rtl] list > .folder > .label { html[dir=rtl] list > .folder > .label {
background-image: url( background-image: -webkit-image-set(
'../../../../../ui/resources/default_100_percent/folder_closed_rtl.png'); url('../../../../../ui/resources/default_100_percent/common/folder_closed_rtl.png') 1x,
url('../../../../../ui/resources/default_200_percent/common/folder_closed_rtl.png') 2x);
} }
<if expr="is_macosx"> <if expr="is_macosx">
......
...@@ -127,13 +127,15 @@ html[dir=rtl] .tree-label { ...@@ -127,13 +127,15 @@ html[dir=rtl] .tree-label {
html[dir=rtl] .tree-label, html[dir=rtl] .tree-label,
html[dir=rtl] .tree-row[may-have-children] > .tree-label { html[dir=rtl] .tree-row[may-have-children] > .tree-label {
background-image: background-image: -webkit-image-set(
url('../../../../../ui/resources/default_100_percent/folder_closed_rtl.png'); url('../../../../../ui/resources/default_100_percent/common/folder_closed_rtl.png') 1x,
url('../../../../../ui/resources/default_200_percent/common/folder_closed_rtl.png') 2x);
} }
html[dir=rtl] .tree-item[expanded] > .tree-row > .tree-label { html[dir=rtl] .tree-item[expanded] > .tree-row > .tree-label {
background-image: background-image: -webkit-image-set(
url('../../../../../ui/resources/default_100_percent/folder_open_rtl.png'); url('../../../../../ui/resources/default_100_percent/common/folder_open_rtl.png') 1x,
url('../../../../../ui/resources/default_200_percent/common/folder_open_rtl.png') 2x);
} }
tree[icon-visibility=hidden] .tree-label { tree[icon-visibility=hidden] .tree-label {
...@@ -148,13 +150,15 @@ tree[icon-visibility=parent] .tree-row[has-children=false] > .tree-label { ...@@ -148,13 +150,15 @@ tree[icon-visibility=parent] .tree-row[has-children=false] > .tree-label {
.tree-label, .tree-label,
.tree-row[may-have-children] > .tree-label { .tree-row[may-have-children] > .tree-label {
background-image: background-image: -webkit-image-set(
url('../../../../../ui/resources/default_100_percent/folder_closed.png'); url('../../../../../ui/resources/default_100_percent/common/folder_closed.png') 1x,
url('../../../../../ui/resources/default_200_percent/common/folder_closed.png') 2x);
} }
.tree-item[expanded] > .tree-row > .tree-label { .tree-item[expanded] > .tree-row > .tree-label {
background-image: background-image: -webkit-image-set(
url('../../../../../ui/resources/default_100_percent/folder_open.png'); url('../../../../../ui/resources/default_100_percent/common/folder_open.png') 1x,
url('../../../../../ui/resources/default_200_percent/common/folder_open.png') 2x);
} }
/* We need to ensure that even empty labels take up space */ /* We need to ensure that even empty labels take up space */
......
...@@ -308,10 +308,10 @@ ...@@ -308,10 +308,10 @@
<if expr="pp_ifdef('toolkit_views')"> <if expr="pp_ifdef('toolkit_views')">
<structure type="chrome_scaled_image" name="IDR_DISCLOSURE_ARROW" file="discloure_arrow.png" /> <structure type="chrome_scaled_image" name="IDR_DISCLOSURE_ARROW" file="discloure_arrow.png" />
</if> </if>
<structure type="chrome_scaled_image" name="IDR_FOLDER_CLOSED" file="folder_closed.png" /> <structure type="chrome_scaled_image" name="IDR_FOLDER_CLOSED" file="common/folder_closed.png" />
<structure type="chrome_scaled_image" name="IDR_FOLDER_CLOSED_RTL" file="folder_closed_rtl.png" /> <structure type="chrome_scaled_image" name="IDR_FOLDER_CLOSED_RTL" file="common/folder_closed_rtl.png" />
<structure type="chrome_scaled_image" name="IDR_FOLDER_OPEN" file="folder_open.png" /> <structure type="chrome_scaled_image" name="IDR_FOLDER_OPEN" file="common/folder_open.png" />
<structure type="chrome_scaled_image" name="IDR_FOLDER_OPEN_RTL" file="folder_open_rtl.png" /> <structure type="chrome_scaled_image" name="IDR_FOLDER_OPEN_RTL" file="common/folder_open_rtl.png" />
<structure type="chrome_scaled_image" name="IDR_FRAME" file="frame_default.png" /> <structure type="chrome_scaled_image" name="IDR_FRAME" file="frame_default.png" />
<structure type="chrome_scaled_image" name="IDR_FRAME_APP_PANEL" file="frame_app_panel_default.png" /> <structure type="chrome_scaled_image" name="IDR_FRAME_APP_PANEL" file="frame_app_panel_default.png" />
<structure type="chrome_scaled_image" name="IDR_FRAME_INACTIVE" file="frame_default_inactive.png" /> <structure type="chrome_scaled_image" name="IDR_FRAME_INACTIVE" file="frame_default_inactive.png" />
......
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