summaryrefslogtreecommitdiffstats
path: root/webkit/glue
diff options
context:
space:
mode:
authortony@chromium.org <tony@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-06-10 09:31:48 +0000
committertony@chromium.org <tony@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-06-10 09:31:48 +0000
commit96a8a89735bcd88a561fa4ee77f674f12bc4ec5a (patch)
treee0dbc0584bb41f7eb148de345697f37776cbeb60 /webkit/glue
parent12175182ad05fa72b6bcf76cfa2b1027ff9752f4 (diff)
downloadchromium_src-96a8a89735bcd88a561fa4ee77f674f12bc4ec5a.zip
chromium_src-96a8a89735bcd88a561fa4ee77f674f12bc4ec5a.tar.gz
chromium_src-96a8a89735bcd88a561fa4ee77f674f12bc4ec5a.tar.bz2
Added resource images for progress bar on Linux.
WebKit side is https://bugs.webkit.org/show_bug.cgi?id=37310 Patch by morrita@google.com originally at http://codereview.chromium.org/2478002/show Review URL: http://codereview.chromium.org/2759007 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@49376 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit/glue')
-rw-r--r--webkit/glue/resources/linux-progress-bar.pngbin0 -> 182 bytes
-rw-r--r--webkit/glue/resources/linux-progress-border-left.pngbin0 -> 148 bytes
-rw-r--r--webkit/glue/resources/linux-progress-border-right.pngbin0 -> 146 bytes
-rw-r--r--webkit/glue/resources/linux-progress-value.pngbin0 -> 167 bytes
-rw-r--r--webkit/glue/webkit_resources.grd4
-rw-r--r--webkit/glue/webkitclient_impl.cc4
6 files changed, 8 insertions, 0 deletions
diff --git a/webkit/glue/resources/linux-progress-bar.png b/webkit/glue/resources/linux-progress-bar.png
new file mode 100644
index 0000000..82a20f5
--- /dev/null
+++ b/webkit/glue/resources/linux-progress-bar.png
Binary files differ
diff --git a/webkit/glue/resources/linux-progress-border-left.png b/webkit/glue/resources/linux-progress-border-left.png
new file mode 100644
index 0000000..0dd0e50
--- /dev/null
+++ b/webkit/glue/resources/linux-progress-border-left.png
Binary files differ
diff --git a/webkit/glue/resources/linux-progress-border-right.png b/webkit/glue/resources/linux-progress-border-right.png
new file mode 100644
index 0000000..d351b11
--- /dev/null
+++ b/webkit/glue/resources/linux-progress-border-right.png
Binary files differ
diff --git a/webkit/glue/resources/linux-progress-value.png b/webkit/glue/resources/linux-progress-value.png
new file mode 100644
index 0000000..251917b
--- /dev/null
+++ b/webkit/glue/resources/linux-progress-value.png
Binary files differ
diff --git a/webkit/glue/webkit_resources.grd b/webkit/glue/webkit_resources.grd
index 352d18c..195c632 100644
--- a/webkit/glue/webkit_resources.grd
+++ b/webkit/glue/webkit_resources.grd
@@ -35,6 +35,10 @@
<include name="IDR_LINUX_RADIO_ON" file="resources\linux-radio-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_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" />
</if>
<include name="IDC_ALIAS" file="resources\aliasb.cur" type="CURSOR" />
diff --git a/webkit/glue/webkitclient_impl.cc b/webkit/glue/webkitclient_impl.cc
index 94b5692..ff0d93b 100644
--- a/webkit/glue/webkitclient_impl.cc
+++ b/webkit/glue/webkitclient_impl.cc
@@ -262,6 +262,10 @@ WebData WebKitClientImpl::loadResource(const char* name) {
{ "linuxRadioOn", IDR_LINUX_RADIO_ON },
{ "linuxRadioDisabledOff", IDR_LINUX_RADIO_DISABLED_OFF },
{ "linuxRadioDisabledOn", IDR_LINUX_RADIO_DISABLED_ON },
+ { "linuxProgressBar", IDR_PROGRESS_BAR },
+ { "linuxProgressValue", IDR_PROGRESS_VALUE },
+ { "linuxProgressBorderLeft", IDR_PROGRESS_BORDER_LEFT },
+ { "linuxProgressBorderRight", IDR_PROGRESS_BORDER_RIGHT },
#endif
};
for (size_t i = 0; i < ARRAYSIZE_UNSAFE(resources); ++i) {