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

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

Issue 10855235: Add new images for closed caption button. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 8 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 | Annotate | Revision Log
« no previous file with comments | « webkit/glue/resources/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 440 matching lines...) Expand 10 before | Expand all | Expand 10 after
451 { "mediaplayerSliderThumbDown", 451 { "mediaplayerSliderThumbDown",
452 IDR_MEDIAPLAYER_SLIDER_THUMB_DOWN, ui::SCALE_FACTOR_100P }, 452 IDR_MEDIAPLAYER_SLIDER_THUMB_DOWN, ui::SCALE_FACTOR_100P },
453 { "mediaplayerVolumeSliderThumb", 453 { "mediaplayerVolumeSliderThumb",
454 IDR_MEDIAPLAYER_VOLUME_SLIDER_THUMB, ui::SCALE_FACTOR_100P }, 454 IDR_MEDIAPLAYER_VOLUME_SLIDER_THUMB, ui::SCALE_FACTOR_100P },
455 { "mediaplayerVolumeSliderThumbHover", 455 { "mediaplayerVolumeSliderThumbHover",
456 IDR_MEDIAPLAYER_VOLUME_SLIDER_THUMB_HOVER, ui::SCALE_FACTOR_100P }, 456 IDR_MEDIAPLAYER_VOLUME_SLIDER_THUMB_HOVER, ui::SCALE_FACTOR_100P },
457 { "mediaplayerVolumeSliderThumbDown", 457 { "mediaplayerVolumeSliderThumbDown",
458 IDR_MEDIAPLAYER_VOLUME_SLIDER_THUMB_DOWN, ui::SCALE_FACTOR_100P }, 458 IDR_MEDIAPLAYER_VOLUME_SLIDER_THUMB_DOWN, ui::SCALE_FACTOR_100P },
459 { "mediaplayerVolumeSliderThumbDisabled", 459 { "mediaplayerVolumeSliderThumbDisabled",
460 IDR_MEDIAPLAYER_VOLUME_SLIDER_THUMB_DISABLED, ui::SCALE_FACTOR_100P }, 460 IDR_MEDIAPLAYER_VOLUME_SLIDER_THUMB_DISABLED, ui::SCALE_FACTOR_100P },
461 { "mediaplayerClosedCaption",
462 IDR_MEDIAPLAYER_CLOSEDCAPTION_BUTTON, ui::SCALE_FACTOR_100P },
463 { "mediaplayerClosedCaption",
464 IDR_MEDIAPLAYER_CLOSEDCAPTION_BUTTON_HOVER, ui::SCALE_FACTOR_100P },
465 { "mediaplayerClosedCaption",
466 IDR_MEDIAPLAYER_CLOSEDCAPTION_BUTTON_DOWN, ui::SCALE_FACTOR_100P },
467 { "mediaplayerClosedCaption",
468 IDR_MEDIAPLAYER_CLOSEDCAPTION_BUTTON_DISABLED, ui::SCALE_FACTOR_100P },
461 { "mediaplayerFullscreen", 469 { "mediaplayerFullscreen",
462 IDR_MEDIAPLAYER_FULLSCREEN_BUTTON, ui::SCALE_FACTOR_100P }, 470 IDR_MEDIAPLAYER_FULLSCREEN_BUTTON, ui::SCALE_FACTOR_100P },
463 { "mediaplayerFullscreenHover", 471 { "mediaplayerFullscreenHover",
464 IDR_MEDIAPLAYER_FULLSCREEN_BUTTON_HOVER, ui::SCALE_FACTOR_100P }, 472 IDR_MEDIAPLAYER_FULLSCREEN_BUTTON_HOVER, ui::SCALE_FACTOR_100P },
465 { "mediaplayerFullscreenDown", 473 { "mediaplayerFullscreenDown",
466 IDR_MEDIAPLAYER_FULLSCREEN_BUTTON_DOWN, ui::SCALE_FACTOR_100P }, 474 IDR_MEDIAPLAYER_FULLSCREEN_BUTTON_DOWN, ui::SCALE_FACTOR_100P },
467 { "mediaplayerFullscreenDisabled", 475 { "mediaplayerFullscreenDisabled",
468 IDR_MEDIAPLAYER_FULLSCREEN_BUTTON_DISABLED, ui::SCALE_FACTOR_100P }, 476 IDR_MEDIAPLAYER_FULLSCREEN_BUTTON_DISABLED, ui::SCALE_FACTOR_100P },
469 #if defined(OS_ANDROID) 477 #if defined(OS_ANDROID)
470 { "mediaplayerOverlayPlay", 478 { "mediaplayerOverlayPlay",
(...skipping 322 matching lines...) Expand 10 before | Expand all | Expand 10 after
793 worker_task_runner->OnWorkerRunLoopStopped(runLoop); 801 worker_task_runner->OnWorkerRunLoopStopped(runLoop);
794 } 802 }
795 803
796 #if defined(OS_ANDROID) 804 #if defined(OS_ANDROID)
797 WebKit::WebFlingAnimator* WebKitPlatformSupportImpl::createFlingAnimator() { 805 WebKit::WebFlingAnimator* WebKitPlatformSupportImpl::createFlingAnimator() {
798 return new FlingAnimatorImpl(); 806 return new FlingAnimatorImpl();
799 } 807 }
800 #endif 808 #endif
801 809
802 } // namespace webkit_glue 810 } // namespace webkit_glue
OLDNEW
« no previous file with comments | « webkit/glue/resources/webkit_resources.grd ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698