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

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

Issue 10035017: Updated media player resources with new images from Ken Moore. (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: test uploading updated media player resource binaries Created 8 years, 8 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) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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/webkitplatformsupport_impl.h" 5 #include "webkit/glue/webkitplatformsupport_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 379 matching lines...) Expand 10 before | Expand all | Expand 10 after
390 { "mediaSoundNone", IDR_MEDIA_SOUND_NONE_BUTTON }, 390 { "mediaSoundNone", IDR_MEDIA_SOUND_NONE_BUTTON },
391 { "mediaSliderThumb", IDR_MEDIA_SLIDER_THUMB }, 391 { "mediaSliderThumb", IDR_MEDIA_SLIDER_THUMB },
392 { "mediaVolumeSliderThumb", IDR_MEDIA_VOLUME_SLIDER_THUMB }, 392 { "mediaVolumeSliderThumb", IDR_MEDIA_VOLUME_SLIDER_THUMB },
393 { "mediaplayerPause", IDR_MEDIAPLAYER_PAUSE_BUTTON }, 393 { "mediaplayerPause", IDR_MEDIAPLAYER_PAUSE_BUTTON },
394 { "mediaplayerPauseHover", IDR_MEDIAPLAYER_PAUSE_BUTTON_HOVER }, 394 { "mediaplayerPauseHover", IDR_MEDIAPLAYER_PAUSE_BUTTON_HOVER },
395 { "mediaplayerPauseDown", IDR_MEDIAPLAYER_PAUSE_BUTTON_DOWN }, 395 { "mediaplayerPauseDown", IDR_MEDIAPLAYER_PAUSE_BUTTON_DOWN },
396 { "mediaplayerPlay", IDR_MEDIAPLAYER_PLAY_BUTTON }, 396 { "mediaplayerPlay", IDR_MEDIAPLAYER_PLAY_BUTTON },
397 { "mediaplayerPlayHover", IDR_MEDIAPLAYER_PLAY_BUTTON_HOVER }, 397 { "mediaplayerPlayHover", IDR_MEDIAPLAYER_PLAY_BUTTON_HOVER },
398 { "mediaplayerPlayDown", IDR_MEDIAPLAYER_PLAY_BUTTON_DOWN }, 398 { "mediaplayerPlayDown", IDR_MEDIAPLAYER_PLAY_BUTTON_DOWN },
399 { "mediaplayerPlayDisabled", IDR_MEDIAPLAYER_PLAY_BUTTON_DISABLED }, 399 { "mediaplayerPlayDisabled", IDR_MEDIAPLAYER_PLAY_BUTTON_DISABLED },
400 { "mediaplayerSoundDisabled", IDR_MEDIAPLAYER_SOUND_DISABLED }, 400 { "mediaplayerSoundLevel3", IDR_MEDIAPLAYER_SOUND_LEVEL3_BUTTON },
401 { "mediaplayerSoundFull", IDR_MEDIAPLAYER_SOUND_FULL_BUTTON }, 401 { "mediaplayerSoundLevel3Hover", IDR_MEDIAPLAYER_SOUND_LEVEL3_BUTTON_HOVER },
402 { "mediaplayerSoundFullHover", IDR_MEDIAPLAYER_SOUND_FULL_BUTTON_HOVER }, 402 { "mediaplayerSoundLevel3Down", IDR_MEDIAPLAYER_SOUND_LEVEL3_BUTTON_DOWN },
403 { "mediaplayerSoundFullDown", IDR_MEDIAPLAYER_SOUND_FULL_BUTTON_DOWN },
404 { "mediaplayerSoundLevel2", IDR_MEDIAPLAYER_SOUND_LEVEL2_BUTTON }, 403 { "mediaplayerSoundLevel2", IDR_MEDIAPLAYER_SOUND_LEVEL2_BUTTON },
405 { "mediaplayerSoundLevel2Hover", 404 { "mediaplayerSoundLevel2Hover",
406 IDR_MEDIAPLAYER_SOUND_LEVEL2_BUTTON_HOVER }, 405 IDR_MEDIAPLAYER_SOUND_LEVEL2_BUTTON_HOVER },
407 { "mediaplayerSoundLevel2Down", IDR_MEDIAPLAYER_SOUND_LEVEL2_BUTTON_DOWN }, 406 { "mediaplayerSoundLevel2Down", IDR_MEDIAPLAYER_SOUND_LEVEL2_BUTTON_DOWN },
408 { "mediaplayerSoundLevel1", IDR_MEDIAPLAYER_SOUND_LEVEL1_BUTTON }, 407 { "mediaplayerSoundLevel1", IDR_MEDIAPLAYER_SOUND_LEVEL1_BUTTON },
409 { "mediaplayerSoundLevel1Hover", 408 { "mediaplayerSoundLevel1Hover",
410 IDR_MEDIAPLAYER_SOUND_LEVEL1_BUTTON_HOVER }, 409 IDR_MEDIAPLAYER_SOUND_LEVEL1_BUTTON_HOVER },
411 { "mediaplayerSoundLevel1Down", IDR_MEDIAPLAYER_SOUND_LEVEL1_BUTTON_DOWN }, 410 { "mediaplayerSoundLevel1Down", IDR_MEDIAPLAYER_SOUND_LEVEL1_BUTTON_DOWN },
412 { "mediaplayerSoundNone", IDR_MEDIAPLAYER_SOUND_NONE_BUTTON }, 411 { "mediaplayerSoundLevel0", IDR_MEDIAPLAYER_SOUND_LEVEL0_BUTTON },
413 { "mediaplayerSoundNoneHover", IDR_MEDIAPLAYER_SOUND_NONE_BUTTON_HOVER }, 412 { "mediaplayerSoundLevel0Hover",
414 { "mediaplayerSoundNoneDown", IDR_MEDIAPLAYER_SOUND_NONE_BUTTON_DOWN }, 413 IDR_MEDIAPLAYER_SOUND_LEVEL0_BUTTON_HOVER },
414 { "mediaplayerSoundLevel0Down", IDR_MEDIAPLAYER_SOUND_LEVEL0_BUTTON_DOWN },
415 { "mediaplayerSoundDisabled", IDR_MEDIAPLAYER_SOUND_DISABLED },
415 { "mediaplayerSliderThumb", IDR_MEDIAPLAYER_SLIDER_THUMB }, 416 { "mediaplayerSliderThumb", IDR_MEDIAPLAYER_SLIDER_THUMB },
416 { "mediaplayerSliderThumbHover", IDR_MEDIAPLAYER_SLIDER_THUMB_HOVER }, 417 { "mediaplayerSliderThumbHover", IDR_MEDIAPLAYER_SLIDER_THUMB_HOVER },
417 { "mediaplayerSliderThumbDown", IDR_MEDIAPLAYER_SLIDER_THUMB_DOWN }, 418 { "mediaplayerSliderThumbDown", IDR_MEDIAPLAYER_SLIDER_THUMB_DOWN },
418 { "mediaplayerVolumeSliderThumb", IDR_MEDIAPLAYER_VOLUME_SLIDER_THUMB }, 419 { "mediaplayerVolumeSliderThumb", IDR_MEDIAPLAYER_VOLUME_SLIDER_THUMB },
419 { "mediaplayerVolumeSliderThumbHover", 420 { "mediaplayerVolumeSliderThumbHover",
420 IDR_MEDIAPLAYER_VOLUME_SLIDER_THUMB_HOVER }, 421 IDR_MEDIAPLAYER_VOLUME_SLIDER_THUMB_HOVER },
421 { "mediaplayerVolumeSliderThumbDown", 422 { "mediaplayerVolumeSliderThumbDown",
422 IDR_MEDIAPLAYER_VOLUME_SLIDER_THUMB_DOWN }, 423 IDR_MEDIAPLAYER_VOLUME_SLIDER_THUMB_DOWN },
424 { "mediaplayerVolumeSliderThumbDisabled",
425 IDR_MEDIAPLAYER_VOLUME_SLIDER_THUMB_DISABLED },
426 { "mediaplayerFullscreen", IDR_MEDIAPLAYER_FULLSCREEN_BUTTON },
427 { "mediaplayerFullscreenHover", IDR_MEDIAPLAYER_FULLSCREEN_BUTTON_HOVER },
428 { "mediaplayerFullscreenDown", IDR_MEDIAPLAYER_FULLSCREEN_BUTTON_DOWN },
429 { "mediaplayerFullscreenDisabled",
430 IDR_MEDIAPLAYER_FULLSCREEN_BUTTON_DISABLED },
423 #if defined(OS_MACOSX) 431 #if defined(OS_MACOSX)
424 { "overhangPattern", IDR_OVERHANG_PATTERN }, 432 { "overhangPattern", IDR_OVERHANG_PATTERN },
425 #endif 433 #endif
426 { "panIcon", IDR_PAN_SCROLL_ICON }, 434 { "panIcon", IDR_PAN_SCROLL_ICON },
427 { "searchCancel", IDR_SEARCH_CANCEL }, 435 { "searchCancel", IDR_SEARCH_CANCEL },
428 { "searchCancelPressed", IDR_SEARCH_CANCEL_PRESSED }, 436 { "searchCancelPressed", IDR_SEARCH_CANCEL_PRESSED },
429 { "searchMagnifier", IDR_SEARCH_MAGNIFIER }, 437 { "searchMagnifier", IDR_SEARCH_MAGNIFIER },
430 { "searchMagnifierResults", IDR_SEARCH_MAGNIFIER_RESULTS }, 438 { "searchMagnifierResults", IDR_SEARCH_MAGNIFIER_RESULTS },
431 { "textAreaResizeCorner", IDR_TEXTAREA_RESIZER }, 439 { "textAreaResizeCorner", IDR_TEXTAREA_RESIZER },
432 { "tickmarkDash", IDR_TICKMARK_DASH }, 440 { "tickmarkDash", IDR_TICKMARK_DASH },
(...skipping 279 matching lines...) Expand 10 before | Expand all | Expand 10 after
712 worker_task_runner->OnWorkerRunLoopStarted(runLoop); 720 worker_task_runner->OnWorkerRunLoopStarted(runLoop);
713 } 721 }
714 722
715 void WebKitPlatformSupportImpl::didStopWorkerRunLoop( 723 void WebKitPlatformSupportImpl::didStopWorkerRunLoop(
716 const WebKit::WebWorkerRunLoop& runLoop) { 724 const WebKit::WebWorkerRunLoop& runLoop) {
717 WorkerTaskRunner* worker_task_runner = WorkerTaskRunner::Instance(); 725 WorkerTaskRunner* worker_task_runner = WorkerTaskRunner::Instance();
718 worker_task_runner->OnWorkerRunLoopStopped(runLoop); 726 worker_task_runner->OnWorkerRunLoopStopped(runLoop);
719 } 727 }
720 728
721 } // namespace webkit_glue 729 } // 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