From 6d11e40470ab1574c8a2a85389a281a5436e8263 Mon Sep 17 00:00:00 2001
From: "pkasting@chromium.org"
 <pkasting@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>
Date: Thu, 8 Jul 2010 22:33:16 +0000
Subject: Clean up .grds, step 1: Alphabetize.

BUG=none
TEST=none

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@51906 0039d316-1c4b-4281-b951-d872f2087c98
---
 webkit/glue/webkit_resources.grd                 | 69 ++++++++++++------------
 webkit/tools/test_shell/test_shell_resources.grd |  3 +-
 2 files changed, 35 insertions(+), 37 deletions(-)

(limited to 'webkit')

diff --git a/webkit/glue/webkit_resources.grd b/webkit/glue/webkit_resources.grd
index 890f5e6..a2146fd 100644
--- a/webkit/glue/webkit_resources.grd
+++ b/webkit/glue/webkit_resources.grd
@@ -4,62 +4,61 @@
     <output filename="grit/webkit_resources.h" type="rc_header">
       <emit emit_type='prepend'></emit>
     </output>
-    <output filename="webkit_resources.rc" type="rc_all" />
     <output filename="webkit_resources.pak" type="data_package" />
+    <output filename="webkit_resources.rc" type="rc_all" />
   </outputs>
   <release seq="1">
     <includes>
+      <include name="IDC_ALIAS" file="resources\aliasb.cur" type="CURSOR" />
       <include name="IDR_BROKENIMAGE" file="resources\broken-image.gif" type="BINDATA" />
-      <include name="IDR_TICKMARK_DASH" file="resources\dash.png" type="BINDATA" />
-      <include name="IDR_PAN_SCROLL_ICON" file="resources\pan_icon.png" type="BINDATA" />
-      <include name="IDR_SEARCH_CANCEL" file="resources\search_cancel.png" type="BINDATA" />
-      <include name="IDR_SEARCH_CANCEL_PRESSED" file="resources\search_cancel_pressed.png" type="BINDATA" />
-      <include name="IDR_SEARCH_MAGNIFIER" file="resources\search_magnifier.png" type="BINDATA" />
-      <include name="IDR_SEARCH_MAGNIFIER_RESULTS" file="resources\search_magnifier_results.png" type="BINDATA" />
-      <include name="IDR_TEXTAREA_RESIZER" file="resources\textarea_resize_corner.png" type="BINDATA" />
+      <include name="IDC_CELL" file="resources\cell.cur" type="CURSOR" />
+      <include name="IDC_COLRESIZE" file="resources\col_resize.cur" type="CURSOR" />
+      <include name="IDC_COPYCUR" file="resources\copy.cur" type="CURSOR" />
+      <include name="IDR_MEDIA_PAUSE_BUTTON" file="resources\media_pause.png" type="BINDATA" />
       <include name="IDR_MEDIA_PLAY_BUTTON" file="resources\media_play.png" type="BINDATA" />
       <include name="IDR_MEDIA_PLAY_BUTTON_DISABLED" file="resources\media_play_disabled.png" type="BINDATA" />
-      <include name="IDR_MEDIA_PAUSE_BUTTON" file="resources\media_pause.png" type="BINDATA" />
+      <include name="IDR_MEDIA_SOUND_DISABLED" file="resources\media_sound_disabled.png" type="BINDATA" />
       <include name="IDR_MEDIA_SOUND_FULL_BUTTON" file="resources\media_sound_full.png" type="BINDATA" />
       <include name="IDR_MEDIA_SOUND_NONE_BUTTON" file="resources\media_sound_none.png" type="BINDATA" />
-      <include name="IDR_MEDIA_SOUND_DISABLED" file="resources\media_sound_disabled.png" type="BINDATA" />
       <include name="IDR_MEDIA_SLIDER_THUMB" file="resources\media_slider_thumb.png" type="BINDATA" />
       <include name="IDR_MEDIA_VOLUME_SLIDER_THUMB" file="resources\media_volume_slider_thumb.png" type="BINDATA" />
+      <include name="IDC_PAN_EAST" file="resources\pan_east.cur" type="CURSOR" />
+      <include name="IDC_PAN_MIDDLE" file="resources\pan_middle.cur" type="CURSOR" />
+      <include name="IDC_PAN_NORTH" file="resources\pan_north.cur" type="CURSOR" />
+      <include name="IDC_PAN_NORTH_EAST" file="resources\pan_north_east.cur" type="CURSOR" />
+      <include name="IDC_PAN_NORTH_WEST" file="resources\pan_north_west.cur" type="CURSOR" />
+      <include name="IDR_PAN_SCROLL_ICON" file="resources\pan_icon.png" type="BINDATA" />
+      <include name="IDC_PAN_SOUTH" file="resources\pan_south.cur" type="CURSOR" />
+      <include name="IDC_PAN_SOUTH_EAST" file="resources\pan_south_east.cur" type="CURSOR" />
+      <include name="IDC_PAN_SOUTH_WEST" file="resources\pan_south_west.cur" type="CURSOR" />
+      <include name="IDC_PAN_WEST" file="resources\pan_west.cur" type="CURSOR" />
+      <include name="IDC_ROWRESIZE" file="resources\row_resize.cur" type="CURSOR" />
+      <include name="IDR_SEARCH_CANCEL" file="resources\search_cancel.png" type="BINDATA" />
+      <include name="IDR_SEARCH_CANCEL_PRESSED" file="resources\search_cancel_pressed.png" type="BINDATA" />
+      <include name="IDR_SEARCH_MAGNIFIER" file="resources\search_magnifier.png" type="BINDATA" />
+      <include name="IDR_SEARCH_MAGNIFIER_RESULTS" file="resources\search_magnifier_results.png" type="BINDATA" />
+      <include name="IDR_TEXTAREA_RESIZER" file="resources\textarea_resize_corner.png" type="BINDATA" />
+      <include name="IDR_TICKMARK_DASH" file="resources\dash.png" type="BINDATA" />
+      <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" />
 
       <if expr="os == 'linux2' or os.find('bsd') != -1 or os == 'sunos5'">
-        <include name="IDR_LINUX_CHECKBOX_OFF" file="resources\linux-checkbox-off.png" type="BINDATA" />
-        <include name="IDR_LINUX_CHECKBOX_ON" file="resources\linux-checkbox-on.png" type="BINDATA" />
-        <include name="IDR_LINUX_CHECKBOX_INDETERMINATE" file="resources\linux-checkbox-indeterminate.png" type="BINDATA" />
+        <include name="IDR_LINUX_CHECKBOX_DISABLED_INDETERMINATE" file="resources\linux-checkbox-disabled-indeterminate.png" type="BINDATA" />
         <include name="IDR_LINUX_CHECKBOX_DISABLED_OFF" file="resources\linux-checkbox-disabled-off.png" type="BINDATA" />
         <include name="IDR_LINUX_CHECKBOX_DISABLED_ON" file="resources\linux-checkbox-disabled-on.png" type="BINDATA" />
-        <include name="IDR_LINUX_CHECKBOX_DISABLED_INDETERMINATE" file="resources\linux-checkbox-disabled-indeterminate.png" type="BINDATA" />
-        <include name="IDR_LINUX_RADIO_OFF" file="resources\linux-radio-off.png" type="BINDATA" />
-        <include name="IDR_LINUX_RADIO_ON" file="resources\linux-radio-on.png" type="BINDATA" />
+        <include name="IDR_LINUX_CHECKBOX_INDETERMINATE" file="resources\linux-checkbox-indeterminate.png" type="BINDATA" />
+        <include name="IDR_LINUX_CHECKBOX_OFF" file="resources\linux-checkbox-off.png" type="BINDATA" />
+        <include name="IDR_LINUX_CHECKBOX_ON" file="resources\linux-checkbox-on.png" type="BINDATA" />
         <include name="IDR_LINUX_RADIO_DISABLED_OFF" file="resources\linux-radio-disabled-off.png" type="BINDATA" />
         <include name="IDR_LINUX_RADIO_DISABLED_ON" file="resources\linux-radio-disabled-on.png" type="BINDATA" />
+        <include name="IDR_LINUX_RADIO_OFF" file="resources\linux-radio-off.png" type="BINDATA" />
+        <include name="IDR_LINUX_RADIO_ON" file="resources\linux-radio-on.png" type="BINDATA" />
         <include name="IDR_PROGRESS_BAR" file="resources\linux-progress-bar.png" type="BINDATA" />
-        <include name="IDR_PROGRESS_VALUE" file="resources\linux-progress-value.png" type="BINDATA" />
         <include name="IDR_PROGRESS_BORDER_LEFT" file="resources\linux-progress-border-left.png" type="BINDATA" />
         <include name="IDR_PROGRESS_BORDER_RIGHT" file="resources\linux-progress-border-right.png" type="BINDATA" />
+        <include name="IDR_PROGRESS_VALUE" file="resources\linux-progress-value.png" type="BINDATA" />
       </if>
-
-      <include name="IDC_ALIAS" file="resources\aliasb.cur" type="CURSOR" />
-      <include name="IDC_CELL" file="resources\cell.cur" type="CURSOR" />
-      <include name="IDC_COLRESIZE" file="resources\col_resize.cur" type="CURSOR" />
-      <include name="IDC_COPYCUR" file="resources\copy.cur" type="CURSOR" />
-      <include name="IDC_ROWRESIZE" file="resources\row_resize.cur" type="CURSOR" />
-      <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="IDC_PAN_MIDDLE" file="resources\pan_middle.cur" type="CURSOR" />
-      <include name="IDC_PAN_NORTH" file="resources\pan_north.cur" type="CURSOR" />
-      <include name="IDC_PAN_NORTH_EAST" file="resources\pan_north_east.cur" type="CURSOR" />
-      <include name="IDC_PAN_EAST" file="resources\pan_east.cur" type="CURSOR" />
-      <include name="IDC_PAN_SOUTH_EAST" file="resources\pan_south_east.cur" type="CURSOR" />
-      <include name="IDC_PAN_SOUTH" file="resources\pan_south.cur" type="CURSOR" />
-      <include name="IDC_PAN_SOUTH_WEST" file="resources\pan_south_west.cur" type="CURSOR" />
-      <include name="IDC_PAN_WEST" file="resources\pan_west.cur" type="CURSOR" />
-      <include name="IDC_PAN_NORTH_WEST" file="resources\pan_north_west.cur" type="CURSOR" />
     </includes>
   </release>
 </grit>
diff --git a/webkit/tools/test_shell/test_shell_resources.grd b/webkit/tools/test_shell/test_shell_resources.grd
index 8391859..09e9b34 100644
--- a/webkit/tools/test_shell/test_shell_resources.grd
+++ b/webkit/tools/test_shell/test_shell_resources.grd
@@ -8,10 +8,9 @@
   </outputs>
   <release seq="1">
     <includes>
+      <include name="IDR_AHEM_FONT" file="resources\AHEM____.TTF" type="BINDATA" />
       <include name="IDR_BROKENIMAGE_TESTSHELL" file="resources\missingImage.gif" type="BINDATA" />
       <include name="IDR_TEXTAREA_RESIZER_TESTSHELL" file="resources\textAreaResizeCorner.png" type="BINDATA" />
-
-      <include name="IDR_AHEM_FONT" file="resources\AHEM____.TTF" type="BINDATA" />
     </includes>
   </release>
 </grit>
-- 
cgit v1.1