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

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

Issue 10830055: adding overlay play button resource for media control on android (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: adding the png file 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/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 442 matching lines...) Expand 10 before | Expand all | Expand 10 after
453 { "mediaplayerVolumeSliderThumbDisabled", 453 { "mediaplayerVolumeSliderThumbDisabled",
454 IDR_MEDIAPLAYER_VOLUME_SLIDER_THUMB_DISABLED, ui::SCALE_FACTOR_100P }, 454 IDR_MEDIAPLAYER_VOLUME_SLIDER_THUMB_DISABLED, ui::SCALE_FACTOR_100P },
455 { "mediaplayerFullscreen", 455 { "mediaplayerFullscreen",
456 IDR_MEDIAPLAYER_FULLSCREEN_BUTTON, ui::SCALE_FACTOR_100P }, 456 IDR_MEDIAPLAYER_FULLSCREEN_BUTTON, ui::SCALE_FACTOR_100P },
457 { "mediaplayerFullscreenHover", 457 { "mediaplayerFullscreenHover",
458 IDR_MEDIAPLAYER_FULLSCREEN_BUTTON_HOVER, ui::SCALE_FACTOR_100P }, 458 IDR_MEDIAPLAYER_FULLSCREEN_BUTTON_HOVER, ui::SCALE_FACTOR_100P },
459 { "mediaplayerFullscreenDown", 459 { "mediaplayerFullscreenDown",
460 IDR_MEDIAPLAYER_FULLSCREEN_BUTTON_DOWN, ui::SCALE_FACTOR_100P }, 460 IDR_MEDIAPLAYER_FULLSCREEN_BUTTON_DOWN, ui::SCALE_FACTOR_100P },
461 { "mediaplayerFullscreenDisabled", 461 { "mediaplayerFullscreenDisabled",
462 IDR_MEDIAPLAYER_FULLSCREEN_BUTTON_DISABLED, ui::SCALE_FACTOR_100P }, 462 IDR_MEDIAPLAYER_FULLSCREEN_BUTTON_DISABLED, ui::SCALE_FACTOR_100P },
463 #if defined(OS_ANDROID)
464 { "mediaplayerOverlayPlay",
465 IDR_MEDIAPLAYER_OVERLAY_PLAY_BUTTON, ui::SCALE_FACTOR_100P },
466 #endif
463 #if defined(OS_MACOSX) 467 #if defined(OS_MACOSX)
464 { "overhangPattern", IDR_OVERHANG_PATTERN, ui::SCALE_FACTOR_100P }, 468 { "overhangPattern", IDR_OVERHANG_PATTERN, ui::SCALE_FACTOR_100P },
465 #endif 469 #endif
466 { "panIcon", IDR_PAN_SCROLL_ICON, ui::SCALE_FACTOR_100P }, 470 { "panIcon", IDR_PAN_SCROLL_ICON, ui::SCALE_FACTOR_100P },
467 { "searchCancel", IDR_SEARCH_CANCEL, ui::SCALE_FACTOR_100P }, 471 { "searchCancel", IDR_SEARCH_CANCEL, ui::SCALE_FACTOR_100P },
468 { "searchCancelPressed", IDR_SEARCH_CANCEL_PRESSED, ui::SCALE_FACTOR_100P }, 472 { "searchCancelPressed", IDR_SEARCH_CANCEL_PRESSED, ui::SCALE_FACTOR_100P },
469 { "searchMagnifier", IDR_SEARCH_MAGNIFIER, ui::SCALE_FACTOR_100P }, 473 { "searchMagnifier", IDR_SEARCH_MAGNIFIER, ui::SCALE_FACTOR_100P },
470 { "searchMagnifierResults", 474 { "searchMagnifierResults",
471 IDR_SEARCH_MAGNIFIER_RESULTS, ui::SCALE_FACTOR_100P }, 475 IDR_SEARCH_MAGNIFIER_RESULTS, ui::SCALE_FACTOR_100P },
472 { "textAreaResizeCorner", IDR_TEXTAREA_RESIZER, ui::SCALE_FACTOR_100P }, 476 { "textAreaResizeCorner", IDR_TEXTAREA_RESIZER, ui::SCALE_FACTOR_100P },
(...skipping 304 matching lines...) Expand 10 before | Expand all | Expand 10 after
777 worker_task_runner->OnWorkerRunLoopStarted(runLoop); 781 worker_task_runner->OnWorkerRunLoopStarted(runLoop);
778 } 782 }
779 783
780 void WebKitPlatformSupportImpl::didStopWorkerRunLoop( 784 void WebKitPlatformSupportImpl::didStopWorkerRunLoop(
781 const WebKit::WebWorkerRunLoop& runLoop) { 785 const WebKit::WebWorkerRunLoop& runLoop) {
782 WorkerTaskRunner* worker_task_runner = WorkerTaskRunner::Instance(); 786 WorkerTaskRunner* worker_task_runner = WorkerTaskRunner::Instance();
783 worker_task_runner->OnWorkerRunLoopStopped(runLoop); 787 worker_task_runner->OnWorkerRunLoopStopped(runLoop);
784 } 788 }
785 789
786 } // namespace webkit_glue 790 } // 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