diff options
author | xiyuan@chromium.org <xiyuan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-01-24 18:18:39 +0000 |
---|---|---|
committer | xiyuan@chromium.org <xiyuan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-01-24 18:18:39 +0000 |
commit | 8b6911d9e06c1215901ec3316f9da58723301733 (patch) | |
tree | 98aa0dc95600dda949a0ff29549b9668992ddfda /webkit | |
parent | bda05a54031aad1d90983e54ff4156e548c5a29a (diff) | |
download | chromium_src-8b6911d9e06c1215901ec3316f9da58723301733.zip chromium_src-8b6911d9e06c1215901ec3316f9da58723301733.tar.gz chromium_src-8b6911d9e06c1215901ec3316f9da58723301733.tar.bz2 |
Clean up webkit resources.
- Remove the original resource files. Those files are now in
gfx/resources.
- Remove webkit_resources references to the orignal resource files.
BUG=chromium-os:9256
TEST=none.
Review URL: http://codereview.chromium.org/6287007
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@72348 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit')
16 files changed, 1 insertions, 36 deletions
diff --git a/webkit/glue/resources/linux-checkbox-disabled-indeterminate.png b/webkit/glue/resources/linux-checkbox-disabled-indeterminate.png Binary files differdeleted file mode 100644 index 171d001..0000000 --- a/webkit/glue/resources/linux-checkbox-disabled-indeterminate.png +++ /dev/null diff --git a/webkit/glue/resources/linux-checkbox-disabled-off.png b/webkit/glue/resources/linux-checkbox-disabled-off.png Binary files differdeleted file mode 100644 index c916674..0000000 --- a/webkit/glue/resources/linux-checkbox-disabled-off.png +++ /dev/null diff --git a/webkit/glue/resources/linux-checkbox-disabled-on.png b/webkit/glue/resources/linux-checkbox-disabled-on.png Binary files differdeleted file mode 100644 index d9ff1c6..0000000 --- a/webkit/glue/resources/linux-checkbox-disabled-on.png +++ /dev/null diff --git a/webkit/glue/resources/linux-checkbox-indeterminate.png b/webkit/glue/resources/linux-checkbox-indeterminate.png Binary files differdeleted file mode 100644 index dcde3c1..0000000 --- a/webkit/glue/resources/linux-checkbox-indeterminate.png +++ /dev/null diff --git a/webkit/glue/resources/linux-checkbox-off.png b/webkit/glue/resources/linux-checkbox-off.png Binary files differdeleted file mode 100644 index 15cc949..0000000 --- a/webkit/glue/resources/linux-checkbox-off.png +++ /dev/null diff --git a/webkit/glue/resources/linux-checkbox-on.png b/webkit/glue/resources/linux-checkbox-on.png Binary files differdeleted file mode 100644 index 4c72e8a..0000000 --- a/webkit/glue/resources/linux-checkbox-on.png +++ /dev/null diff --git a/webkit/glue/resources/linux-progress-bar.png b/webkit/glue/resources/linux-progress-bar.png Binary files differdeleted file mode 100644 index 82a20f5..0000000 --- a/webkit/glue/resources/linux-progress-bar.png +++ /dev/null diff --git a/webkit/glue/resources/linux-progress-border-left.png b/webkit/glue/resources/linux-progress-border-left.png Binary files differdeleted file mode 100644 index 0dd0e50..0000000 --- a/webkit/glue/resources/linux-progress-border-left.png +++ /dev/null diff --git a/webkit/glue/resources/linux-progress-border-right.png b/webkit/glue/resources/linux-progress-border-right.png Binary files differdeleted file mode 100644 index d351b11..0000000 --- a/webkit/glue/resources/linux-progress-border-right.png +++ /dev/null diff --git a/webkit/glue/resources/linux-progress-value.png b/webkit/glue/resources/linux-progress-value.png Binary files differdeleted file mode 100644 index 251917b..0000000 --- a/webkit/glue/resources/linux-progress-value.png +++ /dev/null diff --git a/webkit/glue/resources/linux-radio-disabled-off.png b/webkit/glue/resources/linux-radio-disabled-off.png Binary files differdeleted file mode 100644 index 97aa6f9..0000000 --- a/webkit/glue/resources/linux-radio-disabled-off.png +++ /dev/null diff --git a/webkit/glue/resources/linux-radio-disabled-on.png b/webkit/glue/resources/linux-radio-disabled-on.png Binary files differdeleted file mode 100644 index 07aed36..0000000 --- a/webkit/glue/resources/linux-radio-disabled-on.png +++ /dev/null diff --git a/webkit/glue/resources/linux-radio-off.png b/webkit/glue/resources/linux-radio-off.png Binary files differdeleted file mode 100644 index 6a60a70..0000000 --- a/webkit/glue/resources/linux-radio-off.png +++ /dev/null diff --git a/webkit/glue/resources/linux-radio-on.png b/webkit/glue/resources/linux-radio-on.png Binary files differdeleted file mode 100644 index cb47411..0000000 --- a/webkit/glue/resources/linux-radio-on.png +++ /dev/null diff --git a/webkit/glue/webkit_resources.grd b/webkit/glue/webkit_resources.grd index 94d4286..a11dae9 100644 --- a/webkit/glue/webkit_resources.grd +++ b/webkit/glue/webkit_resources.grd @@ -64,7 +64,7 @@ <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_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" /> @@ -76,23 +76,6 @@ <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" /> - <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_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_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> </includes> </release> </grit> diff --git a/webkit/glue/webkitclient_impl.cc b/webkit/glue/webkitclient_impl.cc index 5c2b8b1..701d5c3 100644 --- a/webkit/glue/webkitclient_impl.cc +++ b/webkit/glue/webkitclient_impl.cc @@ -377,24 +377,6 @@ WebData WebKitClientImpl::loadResource(const char* name) { { "masterCardCC", IDR_AUTOFILL_CC_MASTERCARD }, { "soloCC", IDR_AUTOFILL_CC_SOLO }, { "visaCC", IDR_AUTOFILL_CC_VISA }, -#if defined(OS_POSIX) && !defined(OS_MACOSX) - // TODO(port): rename these to "skia" instead of "Linux". - { "linuxCheckboxDisabledIndeterminate", - IDR_LINUX_CHECKBOX_DISABLED_INDETERMINATE }, - { "linuxCheckboxDisabledOff", IDR_LINUX_CHECKBOX_DISABLED_OFF }, - { "linuxCheckboxDisabledOn", IDR_LINUX_CHECKBOX_DISABLED_ON }, - { "linuxCheckboxIndeterminate", IDR_LINUX_CHECKBOX_INDETERMINATE }, - { "linuxCheckboxOff", IDR_LINUX_CHECKBOX_OFF }, - { "linuxCheckboxOn", IDR_LINUX_CHECKBOX_ON }, - { "linuxRadioDisabledOff", IDR_LINUX_RADIO_DISABLED_OFF }, - { "linuxRadioDisabledOn", IDR_LINUX_RADIO_DISABLED_ON }, - { "linuxRadioOff", IDR_LINUX_RADIO_OFF }, - { "linuxRadioOn", IDR_LINUX_RADIO_ON }, - { "linuxProgressBar", IDR_PROGRESS_BAR }, - { "linuxProgressBorderLeft", IDR_PROGRESS_BORDER_LEFT }, - { "linuxProgressBorderRight", IDR_PROGRESS_BORDER_RIGHT }, - { "linuxProgressValue", IDR_PROGRESS_VALUE }, -#endif }; // Check the name prefix to see if it's an audio resource. |