Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(523)

Side by Side Diff: webkit/glue/webkitclient_impl.cc

Issue 3058019: Add images used by webkit for the speech input button. (Closed)
Patch Set: Addressed pkasting's comment. Created 10 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « webkit/glue/webkit_resources.grd ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2010 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2010 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "webkit/glue/webkitclient_impl.h" 5 #include "webkit/glue/webkitclient_impl.h"
6 6
7 #if defined(OS_LINUX) 7 #if defined(OS_LINUX)
8 #include <malloc.h> 8 #include <malloc.h>
9 #endif 9 #endif
10 10
(...skipping 232 matching lines...) Expand 10 before | Expand all | Expand 10 after
243 { "mediaSoundNone", IDR_MEDIA_SOUND_NONE_BUTTON }, 243 { "mediaSoundNone", IDR_MEDIA_SOUND_NONE_BUTTON },
244 { "mediaSliderThumb", IDR_MEDIA_SLIDER_THUMB }, 244 { "mediaSliderThumb", IDR_MEDIA_SLIDER_THUMB },
245 { "mediaVolumeSliderThumb", IDR_MEDIA_VOLUME_SLIDER_THUMB }, 245 { "mediaVolumeSliderThumb", IDR_MEDIA_VOLUME_SLIDER_THUMB },
246 { "panIcon", IDR_PAN_SCROLL_ICON }, 246 { "panIcon", IDR_PAN_SCROLL_ICON },
247 { "searchCancel", IDR_SEARCH_CANCEL }, 247 { "searchCancel", IDR_SEARCH_CANCEL },
248 { "searchCancelPressed", IDR_SEARCH_CANCEL_PRESSED }, 248 { "searchCancelPressed", IDR_SEARCH_CANCEL_PRESSED },
249 { "searchMagnifier", IDR_SEARCH_MAGNIFIER }, 249 { "searchMagnifier", IDR_SEARCH_MAGNIFIER },
250 { "searchMagnifierResults", IDR_SEARCH_MAGNIFIER_RESULTS }, 250 { "searchMagnifierResults", IDR_SEARCH_MAGNIFIER_RESULTS },
251 { "textAreaResizeCorner", IDR_TEXTAREA_RESIZER }, 251 { "textAreaResizeCorner", IDR_TEXTAREA_RESIZER },
252 { "tickmarkDash", IDR_TICKMARK_DASH }, 252 { "tickmarkDash", IDR_TICKMARK_DASH },
253 { "inputSpeech", IDR_INPUT_SPEECH },
254 { "inputSpeechRecording", IDR_INPUT_SPEECH_RECORDING },
255 { "inputSpeechWaiting", IDR_INPUT_SPEECH_WAITING },
253 #if defined(OS_POSIX) && !defined(OS_MACOSX) 256 #if defined(OS_POSIX) && !defined(OS_MACOSX)
254 // TODO(port): rename these to "skia" instead of "Linux". 257 // TODO(port): rename these to "skia" instead of "Linux".
255 { "linuxCheckboxDisabledIndeterminate", 258 { "linuxCheckboxDisabledIndeterminate",
256 IDR_LINUX_CHECKBOX_DISABLED_INDETERMINATE }, 259 IDR_LINUX_CHECKBOX_DISABLED_INDETERMINATE },
257 { "linuxCheckboxDisabledOff", IDR_LINUX_CHECKBOX_DISABLED_OFF }, 260 { "linuxCheckboxDisabledOff", IDR_LINUX_CHECKBOX_DISABLED_OFF },
258 { "linuxCheckboxDisabledOn", IDR_LINUX_CHECKBOX_DISABLED_ON }, 261 { "linuxCheckboxDisabledOn", IDR_LINUX_CHECKBOX_DISABLED_ON },
259 { "linuxCheckboxIndeterminate", IDR_LINUX_CHECKBOX_INDETERMINATE }, 262 { "linuxCheckboxIndeterminate", IDR_LINUX_CHECKBOX_INDETERMINATE },
260 { "linuxCheckboxOff", IDR_LINUX_CHECKBOX_OFF }, 263 { "linuxCheckboxOff", IDR_LINUX_CHECKBOX_OFF },
261 { "linuxCheckboxOn", IDR_LINUX_CHECKBOX_ON }, 264 { "linuxCheckboxOn", IDR_LINUX_CHECKBOX_ON },
262 { "linuxRadioDisabledOff", IDR_LINUX_RADIO_DISABLED_OFF }, 265 { "linuxRadioDisabledOff", IDR_LINUX_RADIO_DISABLED_OFF },
(...skipping 165 matching lines...) Expand 10 before | Expand all | Expand 10 after
428 ++shared_timer_suspended_; 431 ++shared_timer_suspended_;
429 } 432 }
430 433
431 void WebKitClientImpl::ResumeSharedTimer() { 434 void WebKitClientImpl::ResumeSharedTimer() {
432 // The shared timer may have fired or been adjusted while we were suspended. 435 // The shared timer may have fired or been adjusted while we were suspended.
433 if (--shared_timer_suspended_ == 0 && !shared_timer_.IsRunning()) 436 if (--shared_timer_suspended_ == 0 && !shared_timer_.IsRunning())
434 setSharedTimerFireTime(shared_timer_fire_time_); 437 setSharedTimerFireTime(shared_timer_fire_time_);
435 } 438 }
436 439
437 } // namespace webkit_glue 440 } // namespace webkit_glue
OLDNEW
« no previous file with comments | « webkit/glue/webkit_resources.grd ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698