diff options
| author | Iain Merrick <husky@google.com> | 2010-10-19 14:37:37 +0100 |
|---|---|---|
| committer | Iain Merrick <husky@google.com> | 2010-10-19 14:37:37 +0100 |
| commit | 3345a6884c488ff3a535c2c9acdd33d74b37e311 (patch) | |
| tree | 7784b988ef1698cb6967ea1bdf07616237716c6c /webkit/glue/webkit_resources.grd | |
| parent | efc8475837ec58186051f23bb03542620424f6ce (diff) | |
| download | external_chromium-3345a6884c488ff3a535c2c9acdd33d74b37e311.zip external_chromium-3345a6884c488ff3a535c2c9acdd33d74b37e311.tar.gz external_chromium-3345a6884c488ff3a535c2c9acdd33d74b37e311.tar.bz2 | |
Merge Chromium at 7.0.540.0 : Initial merge by git
Not including third_party/icu as it contains huge data files that break Gerrit, and aren't actually used.
Change-Id: I428a386e70f3b58cacd28677b8cfda282e891e15
Diffstat (limited to 'webkit/glue/webkit_resources.grd')
| -rw-r--r-- | webkit/glue/webkit_resources.grd | 34 |
1 files changed, 34 insertions, 0 deletions
diff --git a/webkit/glue/webkit_resources.grd b/webkit/glue/webkit_resources.grd index a2146fd..94d4286 100644 --- a/webkit/glue/webkit_resources.grd +++ b/webkit/glue/webkit_resources.grd @@ -14,6 +14,9 @@ <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_INPUT_SPEECH" file="resources\input_speech.png" type="BINDATA" /> + <include name="IDR_INPUT_SPEECH_RECORDING" file="resources\input_speech_recording.png" type="BINDATA" /> + <include name="IDR_INPUT_SPEECH_WAITING" file="resources\input_speech_waiting.png" type="BINDATA" /> <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" /> @@ -42,6 +45,37 @@ <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" /> + <include name="IDR_PDF_BUTTON_FTH" file="resources\pdf_button_fth.png" type="BINDATA" /> + <include name="IDR_PDF_BUTTON_FTH_HOVER" file="resources\pdf_button_fth_hover.png" type="BINDATA" /> + <include name="IDR_PDF_BUTTON_FTH_PRESSED" file="resources\pdf_button_fth_pressed.png" type="BINDATA" /> + <include name="IDR_PDF_BUTTON_FTW" file="resources\pdf_button_ftw.png" type="BINDATA" /> + <include name="IDR_PDF_BUTTON_FTW_HOVER" file="resources\pdf_button_ftw_hover.png" type="BINDATA" /> + <include name="IDR_PDF_BUTTON_FTW_PRESSED" file="resources\pdf_button_ftw_pressed.png" type="BINDATA" /> + <include name="IDR_PDF_BUTTON_ZOOMIN" file="resources\pdf_button_zoomin.png" type="BINDATA" /> + <include name="IDR_PDF_BUTTON_ZOOMIN_HOVER" file="resources\pdf_button_zoomin_hover.png" type="BINDATA" /> + <include name="IDR_PDF_BUTTON_ZOOMIN_PRESSED" file="resources\pdf_button_zoomin_pressed.png" type="BINDATA" /> + <include name="IDR_PDF_BUTTON_ZOOMOUT" file="resources\pdf_button_zoomout.png" type="BINDATA" /> + <include name="IDR_PDF_BUTTON_ZOOMOUT_HOVER" file="resources\pdf_button_zoomout_hover.png" type="BINDATA" /> + <include name="IDR_PDF_BUTTON_ZOOMOUT_PRESSED" file="resources\pdf_button_zoomout_pressed.png" type="BINDATA" /> + <include name="IDR_PDF_THUMBNAIL_0" file="resources\pdf_thumbnail_0.png" type="BINDATA" /> + <include name="IDR_PDF_THUMBNAIL_1" file="resources\pdf_thumbnail_1.png" type="BINDATA" /> + <include name="IDR_PDF_THUMBNAIL_2" file="resources\pdf_thumbnail_2.png" type="BINDATA" /> + <include name="IDR_PDF_THUMBNAIL_3" file="resources\pdf_thumbnail_3.png" type="BINDATA" /> + <include name="IDR_PDF_THUMBNAIL_4" file="resources\pdf_thumbnail_4.png" type="BINDATA" /> + <include name="IDR_PDF_THUMBNAIL_5" file="resources\pdf_thumbnail_5.png" type="BINDATA" /> + <include name="IDR_PDF_THUMBNAIL_6" file="resources\pdf_thumbnail_6.png" type="BINDATA" /> + <include name="IDR_PDF_THUMBNAIL_7" file="resources\pdf_thumbnail_7.png" type="BINDATA" /> + <include name="IDR_PDF_THUMBNAIL_8" file="resources\pdf_thumbnail_8.png" type="BINDATA" /> + <include name="IDR_PDF_THUMBNAIL_9" file="resources\pdf_thumbnail_9.png" type="BINDATA" /> + <include name="IDR_PDF_THUMBNAIL_NUM_BACKGROUND" file="resources\pdf_thumbnail_num_background.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" /> |