summaryrefslogtreecommitdiffstats
path: root/webkit/glue
diff options
context:
space:
mode:
authorsatish@chromium.org <satish@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-07-28 19:18:35 +0000
committersatish@chromium.org <satish@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-07-28 19:18:35 +0000
commitad2362c46b65dcfd8adc46092dda3e5db3781063 (patch)
tree79b07cb312f7b95c30a32353f77606a62f80611d /webkit/glue
parent1bd625297949b2d7e8976782b825f7419d49f7f3 (diff)
downloadchromium_src-ad2362c46b65dcfd8adc46092dda3e5db3781063.zip
chromium_src-ad2362c46b65dcfd8adc46092dda3e5db3781063.tar.gz
chromium_src-ad2362c46b65dcfd8adc46092dda3e5db3781063.tar.bz2
Add images used by webkit for the speech input button.
The try servers seem to not support testing these types of resource/image additions, hence all builds fail in try. However I have verified that this builds fine on my windows,mac and linux machines. Please advise if any of the changes in the GRD or webkitclient_impl.cc need to be inside #if ENABLE_INPUT_SPEECH. I did not add the ifdef since I didn't see any for other such features in both these files. BUG=none TEST=none yet as the feature is still being implemented and not enabled Review URL: http://codereview.chromium.org/3058019 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@53991 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit/glue')
-rw-r--r--webkit/glue/resources/input_speech.pngbin0 -> 1507 bytes
-rw-r--r--webkit/glue/resources/input_speech_recording.pngbin0 -> 1255 bytes
-rw-r--r--webkit/glue/resources/input_speech_waiting.pngbin0 -> 255 bytes
-rw-r--r--webkit/glue/webkit_resources.grd3
-rw-r--r--webkit/glue/webkitclient_impl.cc3
5 files changed, 6 insertions, 0 deletions
diff --git a/webkit/glue/resources/input_speech.png b/webkit/glue/resources/input_speech.png
new file mode 100644
index 0000000..c045537
--- /dev/null
+++ b/webkit/glue/resources/input_speech.png
Binary files differ
diff --git a/webkit/glue/resources/input_speech_recording.png b/webkit/glue/resources/input_speech_recording.png
new file mode 100644
index 0000000..b55a9f6
--- /dev/null
+++ b/webkit/glue/resources/input_speech_recording.png
Binary files differ
diff --git a/webkit/glue/resources/input_speech_waiting.png b/webkit/glue/resources/input_speech_waiting.png
new file mode 100644
index 0000000..c4fc87b
--- /dev/null
+++ b/webkit/glue/resources/input_speech_waiting.png
Binary files differ
diff --git a/webkit/glue/webkit_resources.grd b/webkit/glue/webkit_resources.grd
index a2146fd..6dae6e3 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" />
diff --git a/webkit/glue/webkitclient_impl.cc b/webkit/glue/webkitclient_impl.cc
index 19abb0c..e312e11 100644
--- a/webkit/glue/webkitclient_impl.cc
+++ b/webkit/glue/webkitclient_impl.cc
@@ -251,6 +251,9 @@ WebData WebKitClientImpl::loadResource(const char* name) {
{ "searchMagnifierResults", IDR_SEARCH_MAGNIFIER_RESULTS },
{ "textAreaResizeCorner", IDR_TEXTAREA_RESIZER },
{ "tickmarkDash", IDR_TICKMARK_DASH },
+ { "inputSpeech", IDR_INPUT_SPEECH },
+ { "inputSpeechRecording", IDR_INPUT_SPEECH_RECORDING },
+ { "inputSpeechWaiting", IDR_INPUT_SPEECH_WAITING },
#if defined(OS_POSIX) && !defined(OS_MACOSX)
// TODO(port): rename these to "skia" instead of "Linux".
{ "linuxCheckboxDisabledIndeterminate",