AutoFill: Move the CC icons to webkit/glue/resources. This is a temporary

location until they're moved to chrome/common.

BUG=50080
TEST=none

Review URL: http://codereview.chromium.org/3034040

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

10 files changed, 7 insertions, 8 deletions

diff --git a/chrome/browser/browser_resources.grd b/chrome/browser/browser_resources.grd
index bdf3c89..40a11a1 100644
--- a/chrome/browser/browser_resources.grd
+++ b/chrome/browser/browser_resources.grd
@@ -59,14 +59,6 @@ without changes to the corresponding grd file. eadee -->
       <include name="IDR_SYNC_SETUP_DONE_HTML" file="sync\resources\setup_done.html" flattenhtml="true" type="BINDATA" />
       <include name="IDR_SYNC_SETUP_FLOW_HTML" file="sync\resources\setup_flow.html" flattenhtml="true" type="BINDATA" />
       <include name="IDR_TRANSLATE_JS" file="resources\translate.js" type="BINDATA" />
-      <include name="IDR_AUTOFILL_CC_AMEX" file="resources\amex.png" type="BINDATA" />
-      <include name="IDR_AUTOFILL_CC_DINERS" file="resources\diners.png" type="BINDATA" />
-      <include name="IDR_AUTOFILL_CC_GENERIC" file="resources\cc-generic.png" type="BINDATA" />
-      <include name="IDR_AUTOFILL_CC_DISCOVER" file="resources\discover.png" type="BINDATA" />
-      <include name="IDR_AUTOFILL_CC_JCB" file="resources\jcb.png" type="BINDATA" />
-      <include name="IDR_AUTOFILL_CC_MASTERCARD" file="resources\mastercard.png" type="BINDATA" />
-      <include name="IDR_AUTOFILL_CC_SOLO" file="resources\solo.png" type="BINDATA" />
-      <include name="IDR_AUTOFILL_CC_VISA" file="resources\visa.png" type="BINDATA" />
 
       <if expr="pp_ifdef('chromeos')">
         <include name="IDR_ABOUT_SYS_HTML" file="resources\about_sys.html" flattenhtml="true" type="BINDATA" />
diff --git a/chrome/browser/resources/cc-generic.png b/chrome/browser/resources/cc-generic.png
deleted file mode 100644
index d79734c..0000000
--- a/chrome/browser/resources/cc-generic.png
+++ /dev/null
diff --git a/chrome/browser/resources/amex.png b/webkit/glue/resources/amex.png
index 7cfa9cb..7cfa9cb 100644
--- a/chrome/browser/resources/amex.png
+++ b/webkit/glue/resources/amex.png
diff --git a/chrome/browser/resources/diners.png b/webkit/glue/resources/diners.png
index ee709d3..ee709d3 100644
--- a/chrome/browser/resources/diners.png
+++ b/webkit/glue/resources/diners.png
diff --git a/chrome/browser/resources/discover.png b/webkit/glue/resources/discover.png
index e1fdbac..e1fdbac 100644
--- a/chrome/browser/resources/discover.png
+++ b/webkit/glue/resources/discover.png
diff --git a/chrome/browser/resources/jcb.png b/webkit/glue/resources/jcb.png
index 7c915b3..7c915b3 100644
--- a/chrome/browser/resources/jcb.png
+++ b/webkit/glue/resources/jcb.png
diff --git a/chrome/browser/resources/mastercard.png b/webkit/glue/resources/mastercard.png
index 9d7a31f..9d7a31f 100644
--- a/chrome/browser/resources/mastercard.png
+++ b/webkit/glue/resources/mastercard.png
diff --git a/chrome/browser/resources/solo.png b/webkit/glue/resources/solo.png
index 5f20eef..5f20eef 100644
--- a/chrome/browser/resources/solo.png
+++ b/webkit/glue/resources/solo.png
diff --git a/chrome/browser/resources/visa.png b/webkit/glue/resources/visa.png
index 9518614..9518614 100644
--- a/chrome/browser/resources/visa.png
+++ b/webkit/glue/resources/visa.png
diff --git a/webkit/glue/webkit_resources.grd b/webkit/glue/webkit_resources.grd
index e8794db..8337d8e 100644
--- a/webkit/glue/webkit_resources.grd
+++ b/webkit/glue/webkit_resources.grd
@@ -45,7 +45,14 @@
       <include name="IDC_VERTICALTEXT" file="resources\vertical_text.cur" type="CURSOR" />
       <include name="IDC_ZOOMIN" file="resources\zoom_in.cur" type="CURSOR" />
       <include name="IDC_ZOOMOUT" file="resources\zoom_out.cur" type="CURSOR" />
+      <include name="IDR_AUTOFILL_CC_AMEX" file="resources\amex.png" type="BINDATA" />
+      <include name="IDR_AUTOFILL_CC_DINERS" file="resources\diners.png" type="BINDATA" />
+      <include name="IDR_AUTOFILL_CC_DISCOVER" file="resources\discover.png" type="BINDATA" />
       <include name="IDR_AUTOFILL_CC_GENERIC" file="resources\cc-generic.png" type="BINDATA" />
+      <include name="IDR_AUTOFILL_CC_JCB" file="resources\jcb.png" type="BINDATA" />
+      <include name="IDR_AUTOFILL_CC_MASTERCARD" file="resources\mastercard.png" type="BINDATA" />
+      <include name="IDR_AUTOFILL_CC_SOLO" file="resources\solo.png" type="BINDATA" />
+      <include name="IDR_AUTOFILL_CC_VISA" file="resources\visa.png" type="BINDATA" />
 
       <if expr="os == 'linux2' or os.find('bsd') != -1 or os == 'sunos5'">
         <include name="IDR_LINUX_CHECKBOX_DISABLED_INDETERMINATE" file="resources\linux-checkbox-disabled-indeterminate.png" type="BINDATA" />