Move remaining images from ui/resources to default_100_percent and use correct scale in css files

BUG=129203
TEST=Build

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

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@142602 0039d316-1c4b-4281-b951-d872f2087c98

24 files changed, 123 insertions, 64 deletions

diff --git a/chrome/browser/resources/bookmark_manager/css/bmm.css b/chrome/browser/resources/bookmark_manager/css/bmm.css
index d556333..cfe58a9 100644
--- a/chrome/browser/resources/bookmark_manager/css/bmm.css
+++ b/chrome/browser/resources/bookmark_manager/css/bmm.css
@@ -68,7 +68,8 @@ html[dir=rtl] list .label {
 }
 
 list > .folder > .label {
-  background-image: url('../../../../../ui/resources/folder_closed.png');
+  background-image:
+      url('../../../../../ui/resources/default_100_percent/folder_closed.png');
 }
 
 /* We need to ensure that even empty labels take up space */
@@ -171,7 +172,8 @@ list [editing] .url {
 /* end editing */
 
 html[dir=rtl] list > .folder > .label {
-  background-image: url('../../../../../ui/resources/folder_closed_rtl.png');
+  background-image: url(
+      '../../../../../ui/resources/default_100_percent/folder_closed_rtl.png');
 }
 
 <if expr="is_macosx">
diff --git a/chrome/browser/resources/chromeos/login/user_pod_row.css b/chrome/browser/resources/chromeos/login/user_pod_row.css
index 288076a..faa04dc 100644
--- a/chrome/browser/resources/chromeos/login/user_pod_row.css
+++ b/chrome/browser/resources/chromeos/login/user_pod_row.css
@@ -179,7 +179,10 @@ html[dir=rtl] .pod .capslock-hint {
 
 .remove-user-button {
   -webkit-transition: width 100ms ease-in-out, background 200ms ease-in-out;
-  background: url('../../../../../ui/resources/close_bar.png') center center no-repeat;
+  background: -webkit-image-set(
+      url('../../../../../ui/resources/default_100_percent/close_bar.png') 1x,
+      url('../../../../../ui/resources/default_200_percent/close_bar.png') 2x)
+      center center no-repeat;
   background-color: rgba(255, 255, 255, 0.3);
   border-radius: 2px;
   box-shadow: none;
@@ -208,7 +211,11 @@ html[dir=rtl] .pod .capslock-hint {
 }
 
 .remove-user-button:hover {
-  background-image: url('../../../../../ui/resources/close_bar_h.png');
+  background-image: -webkit-image-set(
+      url('../../../../../ui/resources/default_100_percent/close_bar_hover.png')
+          1x,
+      url('../../../../../ui/resources/default_200_percent/close_bar_hover.png')
+          2x);
   box-shadow: none;
 }
 
diff --git a/chrome/browser/resources/ntp4/new_tab.css b/chrome/browser/resources/ntp4/new_tab.css
index cc67183..cdaabae 100644
--- a/chrome/browser/resources/ntp4/new_tab.css
+++ b/chrome/browser/resources/ntp4/new_tab.css
@@ -73,7 +73,9 @@ html[dir='rtl'] #notification-container {
   background: no-repeat;
   background-color: transparent;
   /* TODO(estade): this should animate between states. */
-  background-image: url('../../../../ui/resources/close_bar.png');
+  background-image: -webkit-image-set(
+      url('../../../../ui/resources/default_100_percent/close_bar.png') 1x,
+      url('../../../../ui/resources/default_200_percent/close_bar.png') 2x);
   border: 0;
   cursor: default;
   display: inline-block;
@@ -84,11 +86,19 @@ html[dir='rtl'] #notification-container {
 
 .close-button:hover,
 .close-button:focus {
-  background-image: url('../../../../ui/resources/close_bar_h.png');
+  background-image: -webkit-image-set(
+      url('../../../../ui/resources/default_100_percent/close_bar_hover.png')
+          1x,
+      url('../../../../ui/resources/default_200_percent/close_bar_hover.png')
+          2x);
 }
 
 .close-button:active {
-  background-image: url('../../../../ui/resources/close_bar_p.png');
+  background-image: -webkit-image-set(
+      url('../../../../ui/resources/default_100_percent/close_bar_pressed.png')
+          1x,
+      url('../../../../ui/resources/default_200_percent/close_bar_pressed.png')
+          2x);
 }
 
 .link-button {
diff --git a/chrome/browser/resources/options2/chromeos/accounts_options_page.css b/chrome/browser/resources/options2/chromeos/accounts_options_page.css
index beb3934..ec7971e 100644
--- a/chrome/browser/resources/options2/chromeos/accounts_options_page.css
+++ b/chrome/browser/resources/options2/chromeos/accounts_options_page.css
@@ -42,13 +42,19 @@
 }
 
 .remove-user-button {
-  background-image: url('../../../../../ui/resources/close_bar.png');
+  background-image: -webkit-image-set(
+      url('../../../../../ui/resources/default_100_percent/close_bar.png') 1x,
+      url('../../../../../ui/resources/default_200_percent/close_bar.png') 2x);
   height: 16px;
   width: 16px;
 }
 
 .remove-user-button:hover {
-  background-image: url('../../../../../ui/resources/close_bar_h.png');
+  background-image: -webkit-image-set(
+      url('../../../../../ui/resources/default_100_percent/close_bar_hover.png')
+          1x,
+      url('../../../../../ui/resources/default_200_percent/close_bar_hover.png')
+          2x);
 }
 
 #userList {
diff --git a/chrome/browser/resources/options2/options_page.css b/chrome/browser/resources/options2/options_page.css
index e3742c9..e6273ff 100644
--- a/chrome/browser/resources/options2/options_page.css
+++ b/chrome/browser/resources/options2/options_page.css
@@ -273,7 +273,9 @@ list .row-delete-button {
   -webkit-transition: 150ms opacity;
   background-color: transparent;
   /* TODO(stuartmorgan): Replace with real images once they are available. */
-  background-image: url('../../../../ui/resources/close_bar.png');
+  background-image: -webkit-image-set(
+      url('../../../../ui/resources/default_100_percent/close_bar.png') 1x,
+      url('../../../../ui/resources/default_200_percent/close_bar.png') 2x);
   border: none;
   display: block;
   height: 16px;
@@ -297,11 +299,19 @@ list div[role='listitem'][managedby='HostedApp'] .row-delete-button {
 }
 
 list .row-delete-button:hover {
-  background-image: url('../../../../ui/resources/close_bar_h.png');
+  background-image: -webkit-image-set(
+      url('../../../../ui/resources/default_100_percent/close_bar_hover.png')
+          1x,
+      url('../../../../ui/resources/default_200_percent/close_bar_hover.png')
+          2x);
 }
 
 list .row-delete-button:active {
-  background-image: url('../../../../ui/resources/close_bar_p.png');
+  background-image: -webkit-image-set(
+      url('../../../../ui/resources/default_100_percent/close_bar_pressed.png')
+          1x,
+      url('../../../../ui/resources/default_200_percent/close_bar_pressed.png')
+          2x);
 }
 
 list .static-text {
diff --git a/chrome/browser/resources/shared/css/bubble.css b/chrome/browser/resources/shared/css/bubble.css
index b60c9c7..f46614c 100644
--- a/chrome/browser/resources/shared/css/bubble.css
+++ b/chrome/browser/resources/shared/css/bubble.css
@@ -38,15 +38,25 @@ html[dir='rtl'] .bubble-close {
 }
 
 .bubble-close {
-  background-image: url('../../../../../ui/resources/close_bar.png');
+  background-image: -webkit-image-set(
+      url('../../../../../ui/resources/default_100_percent/close_bar.png') 1x,
+      url('../../../../../ui/resources/default_200_percent/close_bar.png') 2x);
 }
 
 .bubble-close:hover {
-  background-image: url('../../../../../ui/resources/close_bar_h.png');
+  background-image: -webkit-image-set(
+      url('../../../../../ui/resources/default_100_percent/close_bar_hover.png')
+          1x,
+      url('../../../../../ui/resources/default_200_percent/close_bar_hover.png')
+          2x);
 }
 
 .bubble-close:active {
-  background-image: url('../../../../../ui/resources/close_bar_p.png');
+  background-image: -webkit-image-set(
+    url('../../../../../ui/resources/default_100_percent/close_bar_pressed.png')
+        1x,
+    url('../../../../../ui/resources/default_200_percent/close_bar_pressed.png')
+        2x);
 }
 
 .bubble-shadow {
diff --git a/chrome/browser/resources/shared/css/expandable_bubble.css b/chrome/browser/resources/shared/css/expandable_bubble.css
index c4c05c5..e181b0d 100644
--- a/chrome/browser/resources/shared/css/expandable_bubble.css
+++ b/chrome/browser/resources/shared/css/expandable_bubble.css
@@ -74,13 +74,23 @@
 }
 
 .expandable-bubble-close {
-  background-image: url('../../../../../ui/resources/close_bar.png');
+  background-image: -webkit-image-set(
+      url('../../../../../ui/resources/default_100_percent/close_bar.png') 1x,
+      url('../../../../../ui/resources/default_200_percent/close_bar.png') 2x);
 }
 
 .expandable-bubble-close:hover {
-  background-image: url('../../../../../ui/resources/close_bar_h.png');
+  background-image: -webkit-image-set(
+      url('../../../../../ui/resources/default_100_percent/close_bar_hover.png')
+          1x,
+      url('../../../../../ui/resources/default_200_percent/close_bar_hover.png')
+          2x);
 }
 
 .expandable-bubble-close:active {
-  background-image: url('../../../../../ui/resources/close_bar_p.png');
+  background-image: -webkit-image-set(
+    url('../../../../../ui/resources/default_100_percent/close_bar_pressed.png')
+        1x,
+    url('../../../../../ui/resources/default_200_percent/close_bar_pressed.png')
+        2x);
 }
diff --git a/chrome/browser/resources/shared/css/tree.css b/chrome/browser/resources/shared/css/tree.css
index c238585..3fcfc0e 100644
--- a/chrome/browser/resources/shared/css/tree.css
+++ b/chrome/browser/resources/shared/css/tree.css
@@ -120,11 +120,13 @@ html[dir=rtl] .tree-label {
 
 html[dir=rtl] .tree-label,
 html[dir=rtl] .tree-row[may-have-children] > .tree-label {
-  background-image: url('../../../../../ui/resources/folder_closed_rtl.png');
+  background-image:
+   url('../../../../../ui/resources/default_100_percent/folder_closed_rtl.png');
 }
 
 html[dir=rtl] .tree-item[expanded] > .tree-row > .tree-label {
-  background-image: url('../../../../../ui/resources/folder_open_rtl.png');
+  background-image:
+     url('../../../../../ui/resources/default_100_percent/folder_open_rtl.png');
 }
 
 tree[icon-visibility=hidden] .tree-label {
@@ -139,11 +141,13 @@ tree[icon-visibility=parent] .tree-row[has-children=false] > .tree-label {
 
 .tree-label,
 .tree-row[may-have-children] > .tree-label {
-  background-image: url('../../../../../ui/resources/folder_closed.png');
+  background-image:
+      url('../../../../../ui/resources/default_100_percent/folder_closed.png');
 }
 
 .tree-item[expanded] > .tree-row > .tree-label {
-  background-image: url('../../../../../ui/resources/folder_open.png');
+  background-image:
+      url('../../../../../ui/resources/default_100_percent/folder_open.png');
 }
 
 /* We need to ensure that even empty labels take up space */
diff --git a/chrome/browser/resources/shared_resources.grd b/chrome/browser/resources/shared_resources.grd
index 2675798..44cf9db 100644
--- a/chrome/browser/resources/shared_resources.grd
+++ b/chrome/browser/resources/shared_resources.grd
@@ -68,7 +68,8 @@ without changes to the corresponding grd file. -->
       <structure name="IDR_SHARED_CSS_TRASH"
                  file="shared/css/trash.css" type="chrome_html" />
       <structure name="IDR_SHARED_CSS_TREE"
-                 file="shared/css/tree.css" type="chrome_html" />
+                 file="shared/css/tree.css" type="chrome_html"
+                 flattenhtml="true" />
       <structure name="IDR_SHARED_CSS_TREE_JS"
                  file="shared/css/tree.css.js" type="chrome_html" />
       <structure name="IDR_SHARED_CSS_WIDGETS"
diff --git a/chrome/browser/ui/webui/shared_resources_data_source.cc b/chrome/browser/ui/webui/shared_resources_data_source.cc
index c636280..2c2d35b 100644
--- a/chrome/browser/ui/webui/shared_resources_data_source.cc
+++ b/chrome/browser/ui/webui/shared_resources_data_source.cc
@@ -25,28 +25,16 @@
 namespace {
 
 int PathToIDR(const std::string& path) {
-  int idr = -1;
-  if (path == "ui/resources/folder_closed.png") {
-    idr = IDR_FOLDER_CLOSED;
-  } else if (path == "ui/resources/folder_closed_rtl.png") {
-    idr = IDR_FOLDER_CLOSED_RTL;
-  } else if (path == "ui/resources/folder_open.png") {
-    idr = IDR_FOLDER_OPEN;
-  } else if (path == "ui/resources/folder_open_rtl.png") {
-    idr = IDR_FOLDER_OPEN_RTL;
-  } else if (path == "ui/resources/throbber.png") {
-    idr = IDR_THROBBER;
-  } else {
-    // The name of the files in the grd list are prefixed with the following
-    // directory:
-    std::string key("shared/");
-    key += path;
+  // The name of the files in the grd list are prefixed with the following
+  // directory:
+  std::string key("shared/");
+  key += path;
 
-    for (size_t i = 0; i < kSharedResourcesSize; ++i) {
-      if (kSharedResources[i].name == key) {
-        idr = kSharedResources[i].value;
-        break;
-      }
+  int idr = -1;
+  for (size_t i = 0; i < kSharedResourcesSize; ++i) {
+    if (kSharedResources[i].name == key) {
+      idr = kSharedResources[i].value;
+      break;
     }
   }
 
diff --git a/chrome/renderer/resources/plugin_placeholders.css b/chrome/renderer/resources/plugin_placeholders.css
index 9dc43e7..3821cec 100644
--- a/chrome/renderer/resources/plugin_placeholders.css
+++ b/chrome/renderer/resources/plugin_placeholders.css
@@ -1,3 +1,7 @@
+/* Copyright (c) 2012 The Chromium Authors. All rights reserved.
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file. */
+
 body {
   font-family: sans-serif;
   margin: 0;
@@ -44,15 +48,22 @@ p {
   top: 3px;
   height: 14px;
   width: 14px;
-  background-image: url("../../../ui/resources/close_bar.png");
+  background-image: -webkit-image-set(
+      url('../../../ui/resources/default_100_percent/close_bar.png') 1x,
+      url('../../../ui/resources/default_200_percent/close_bar.png') 2x);
   background-position: right top;
   background-repeat: no-repeat;
 }
 
 #close:hover {
-  background-image: url("../../../ui/resources/close_bar_h.png");
+  background-image: -webkit-image-set(
+      url('../../../ui/resources/default_100_percent/close_bar_hover.png') 1x,
+      url('../../../ui/resources/default_200_percent/close_bar_hover.png') 2x);
 }
 
 #close:active {
-  background-image: url("../../../ui/resources/close_bar_p.png");
+  background-image: -webkit-image-set(
+      url('../../../ui/resources/default_100_percent/close_bar_pressed.png') 1x,
+      url('../../../ui/resources/default_200_percent/close_bar_pressed.png')
+          2x);
 }
diff --git a/ui/resources/close_bar.png b/ui/resources/close_bar.png
deleted file mode 100644
index 912df05d..0000000
--- a/ui/resources/close_bar.png
+++ /dev/null
diff --git a/ui/resources/close_bar_h.png b/ui/resources/close_bar_h.png
deleted file mode 100644
index c5e1481..0000000
--- a/ui/resources/close_bar_h.png
+++ /dev/null
diff --git a/ui/resources/close_bar_mask.png b/ui/resources/close_bar_mask.png
deleted file mode 100644
index 0b604ee..0000000
--- a/ui/resources/close_bar_mask.png
+++ /dev/null
diff --git a/ui/resources/close_bar_p.png b/ui/resources/close_bar_p.png
deleted file mode 100644
index cc5bbbe..0000000
--- a/ui/resources/close_bar_p.png
+++ /dev/null
diff --git a/ui/resources/folder_closed.png b/ui/resources/folder_closed.png
deleted file mode 100644
index 746fab9..0000000
--- a/ui/resources/folder_closed.png
+++ /dev/null
diff --git a/ui/resources/folder_closed_rtl.png b/ui/resources/folder_closed_rtl.png
deleted file mode 100644
index 3d4c37f..0000000
--- a/ui/resources/folder_closed_rtl.png
+++ /dev/null
diff --git a/ui/resources/folder_open.png b/ui/resources/folder_open.png
deleted file mode 100644
index 3276810..0000000
--- a/ui/resources/folder_open.png
+++ /dev/null
diff --git a/ui/resources/folder_open_rtl.png b/ui/resources/folder_open_rtl.png
deleted file mode 100644
index 9ba7069..0000000
--- a/ui/resources/folder_open_rtl.png
+++ /dev/null
diff --git a/ui/resources/oak.png b/ui/resources/oak.png
deleted file mode 100644
index a439e4c..0000000
--- a/ui/resources/oak.png
+++ /dev/null
diff --git a/ui/resources/ui_resources.grd b/ui/resources/ui_resources.grd
index 2153456..6d3ccce 100644
--- a/ui/resources/ui_resources.grd
+++ b/ui/resources/ui_resources.grd
@@ -31,10 +31,10 @@
       <include name="IDR_CONTENT_RIGHT_SIDE" file="default_100_percent/content_right_side.png" type="BINDATA" />
       <include name="IDR_DEFAULT_FAVICON" file="default_100_percent/default_favicon.png" type="BINDATA" />
       <include name="IDR_DEFAULT_LARGE_FAVICON" file="default_100_percent/default_large_favicon.png" type="BINDATA" />
-      <include name="IDR_FOLDER_CLOSED" file="folder_closed.png" type="BINDATA" />
-      <include name="IDR_FOLDER_CLOSED_RTL" file="folder_closed_rtl.png" type="BINDATA" />
-      <include name="IDR_FOLDER_OPEN" file="folder_open.png" type="BINDATA" />
-      <include name="IDR_FOLDER_OPEN_RTL" file="folder_open_rtl.png" type="BINDATA" />
+      <include name="IDR_FOLDER_CLOSED" file="default_100_percent/folder_closed.png" type="BINDATA" />
+      <include name="IDR_FOLDER_CLOSED_RTL" file="default_100_percent/folder_closed_rtl.png" type="BINDATA" />
+      <include name="IDR_FOLDER_OPEN" file="default_100_percent/folder_open.png" type="BINDATA" />
+      <include name="IDR_FOLDER_OPEN_RTL" file="default_100_percent/folder_open_rtl.png" type="BINDATA" />
       <include name="IDR_FRAME" file="default_100_percent/frame_default.png" type="BINDATA" />
       <include name="IDR_FRAME_APP_PANEL" file="default_100_percent/frame_app_panel_default.png" type="BINDATA" />
       <include name="IDR_FRAME_INACTIVE" file="default_100_percent/frame_default_inactive.png" type="BINDATA" />
@@ -284,7 +284,7 @@
         <include name="IDR_AURA_WINDOW_ZOOM_ICON" file="default_100_percent/aura/slab_zoom.png" type="BINDATA" />
 
         <include name="IDR_AURA_SWITCH_MONITOR" file="default_100_percent/ash/switch_monitor.png" type="BINDATA" />
-        <include name="IDR_OAK" file="oak.png" type="BINDATA"/>
+        <include name="IDR_OAK" file="default_100_percent/oak.png" type="BINDATA"/>
       </if>
     </includes>
   </release>
diff --git a/ui/resources/ui_resources_standard.grd b/ui/resources/ui_resources_standard.grd
index e6a0bdf..2b964d4 100644
--- a/ui/resources/ui_resources_standard.grd
+++ b/ui/resources/ui_resources_standard.grd
@@ -40,10 +40,10 @@
       <include name="IDR_BUBBLE_SHADOW_TL" file="default_100_percent/bubble_shadow_tl.png" type="BINDATA" />
       <include name="IDR_BUBBLE_SHADOW_TR" file="default_100_percent/bubble_shadow_tr.png" type="BINDATA" />
 
-      <include name="IDR_CLOSE_BAR" file="close_bar.png" type="BINDATA" />
-      <include name="IDR_CLOSE_BAR_H" file="close_bar_h.png" type="BINDATA" />
-      <include name="IDR_CLOSE_BAR_MASK" file="close_bar_mask.png" type="BINDATA" />
-      <include name="IDR_CLOSE_BAR_P" file="close_bar_p.png" type="BINDATA" />
+      <include name="IDR_CLOSE_BAR" file="default_100_percent/close_bar.png" type="BINDATA" />
+      <include name="IDR_CLOSE_BAR_H" file="default_100_percent/close_bar_hover.png" type="BINDATA" />
+      <include name="IDR_CLOSE_BAR_MASK" file="default_100_percent/close_bar_mask.png" type="BINDATA" />
+      <include name="IDR_CLOSE_BAR_P" file="default_100_percent/close_bar_pressed.png" type="BINDATA" />
       <include name="IDR_THROBBER" file="default_100_percent/throbber.png" type="BINDATA" />
 
       <!-- Remaining images only used by Aura. -->
diff --git a/ui/resources/ui_resources_touch.grd b/ui/resources/ui_resources_touch.grd
index fd7aa98..e81c6db 100644
--- a/ui/resources/ui_resources_touch.grd
+++ b/ui/resources/ui_resources_touch.grd
@@ -37,10 +37,10 @@
       <include name="IDR_BUBBLE_SHADOW_TL" file="default_100_percent/bubble_shadow_tl.png" type="BINDATA" />
       <include name="IDR_BUBBLE_SHADOW_TR" file="default_100_percent/bubble_shadow_tr.png" type="BINDATA" />
 
-      <include name="IDR_CLOSE_BAR" file="close_bar.png" type="BINDATA" />
-      <include name="IDR_CLOSE_BAR_H" file="close_bar_h.png" type="BINDATA" />
-      <include name="IDR_CLOSE_BAR_MASK" file="close_bar_mask.png" type="BINDATA" />
-      <include name="IDR_CLOSE_BAR_P" file="close_bar_p.png" type="BINDATA" />
+      <include name="IDR_CLOSE_BAR" file="default_100_percent/close_bar.png" type="BINDATA" />
+      <include name="IDR_CLOSE_BAR_H" file="default_100_percent/close_bar_hover.png" type="BINDATA" />
+      <include name="IDR_CLOSE_BAR_MASK" file="default_100_percent/close_bar_mask.png" type="BINDATA" />
+      <include name="IDR_CLOSE_BAR_P" file="default_100_percent/close_bar_pressed.png" type="BINDATA" />
       <include name="IDR_THROBBER" file="default_100_percent/throbber.png" type="BINDATA" />
 
       <!-- Remaining images only used by Aura. -->
diff --git a/ui/resources/ui_resources_touch_2x.grd b/ui/resources/ui_resources_touch_2x.grd
index c589819..e340daa 100644
--- a/ui/resources/ui_resources_touch_2x.grd
+++ b/ui/resources/ui_resources_touch_2x.grd
@@ -37,10 +37,10 @@
       <include name="IDR_BUBBLE_SHADOW_TL" file="default_100_percent/bubble_shadow_tl.png" type="BINDATA" />
       <include name="IDR_BUBBLE_SHADOW_TR" file="default_100_percent/bubble_shadow_tr.png" type="BINDATA" />
 
-      <include name="IDR_CLOSE_BAR" file="close_bar.png" type="BINDATA" />
-      <include name="IDR_CLOSE_BAR_H" file="close_bar_h.png" type="BINDATA" />
-      <include name="IDR_CLOSE_BAR_MASK" file="close_bar_mask.png" type="BINDATA" />
-      <include name="IDR_CLOSE_BAR_P" file="close_bar_p.png" type="BINDATA" />
+      <include name="IDR_CLOSE_BAR" file="default_200_percent/close_bar.png" type="BINDATA" />
+      <include name="IDR_CLOSE_BAR_H" file="default_200_percent/close_bar_hover.png" type="BINDATA" />
+      <include name="IDR_CLOSE_BAR_MASK" file="default_200_percent/close_bar_mask.png" type="BINDATA" />
+      <include name="IDR_CLOSE_BAR_P" file="default_200_percent/close_bar_pressed.png" type="BINDATA" />
       <include name="IDR_THROBBER" file="default_200_percent/throbber.png" type="BINDATA" />
 
       <!-- Remaining images only used by Aura. -->