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

Side by Side Diff: content/child/blink_platform_impl.cc

Issue 711083002: Use different icons for the overlay and non-overlay cast buttons (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 1 month 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 | « content/app/resources/default_100_percent/mediaplayer_overlay_cast_off.png ('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 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 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 "content/child/blink_platform_impl.h" 5 #include "content/child/blink_platform_impl.h"
6 6
7 #include <math.h> 7 #include <math.h>
8 8
9 #include <vector> 9 #include <vector>
10 10
(...skipping 768 matching lines...) Expand 10 before | Expand all | Expand 10 after
779 { "mediaplayerFullscreenHover", 779 { "mediaplayerFullscreenHover",
780 IDR_MEDIAPLAYER_FULLSCREEN_BUTTON_HOVER, ui::SCALE_FACTOR_100P }, 780 IDR_MEDIAPLAYER_FULLSCREEN_BUTTON_HOVER, ui::SCALE_FACTOR_100P },
781 { "mediaplayerFullscreenDown", 781 { "mediaplayerFullscreenDown",
782 IDR_MEDIAPLAYER_FULLSCREEN_BUTTON_DOWN, ui::SCALE_FACTOR_100P }, 782 IDR_MEDIAPLAYER_FULLSCREEN_BUTTON_DOWN, ui::SCALE_FACTOR_100P },
783 { "mediaplayerCastOff", 783 { "mediaplayerCastOff",
784 IDR_MEDIAPLAYER_CAST_BUTTON_OFF, ui::SCALE_FACTOR_100P }, 784 IDR_MEDIAPLAYER_CAST_BUTTON_OFF, ui::SCALE_FACTOR_100P },
785 { "mediaplayerCastOn", 785 { "mediaplayerCastOn",
786 IDR_MEDIAPLAYER_CAST_BUTTON_ON, ui::SCALE_FACTOR_100P }, 786 IDR_MEDIAPLAYER_CAST_BUTTON_ON, ui::SCALE_FACTOR_100P },
787 { "mediaplayerFullscreenDisabled", 787 { "mediaplayerFullscreenDisabled",
788 IDR_MEDIAPLAYER_FULLSCREEN_BUTTON_DISABLED, ui::SCALE_FACTOR_100P }, 788 IDR_MEDIAPLAYER_FULLSCREEN_BUTTON_DISABLED, ui::SCALE_FACTOR_100P },
789 { "mediaplayerOverlayCastOff",
790 IDR_MEDIAPLAYER_OVERLAY_CAST_BUTTON_OFF, ui::SCALE_FACTOR_100P },
789 { "mediaplayerOverlayPlay", 791 { "mediaplayerOverlayPlay",
790 IDR_MEDIAPLAYER_OVERLAY_PLAY_BUTTON, ui::SCALE_FACTOR_100P }, 792 IDR_MEDIAPLAYER_OVERLAY_PLAY_BUTTON, ui::SCALE_FACTOR_100P },
791 #if defined(OS_MACOSX) 793 #if defined(OS_MACOSX)
792 { "overhangPattern", IDR_OVERHANG_PATTERN, ui::SCALE_FACTOR_100P }, 794 { "overhangPattern", IDR_OVERHANG_PATTERN, ui::SCALE_FACTOR_100P },
793 { "overhangShadow", IDR_OVERHANG_SHADOW, ui::SCALE_FACTOR_100P }, 795 { "overhangShadow", IDR_OVERHANG_SHADOW, ui::SCALE_FACTOR_100P },
794 #endif 796 #endif
795 { "panIcon", IDR_PAN_SCROLL_ICON, ui::SCALE_FACTOR_100P }, 797 { "panIcon", IDR_PAN_SCROLL_ICON, ui::SCALE_FACTOR_100P },
796 { "searchCancel", IDR_SEARCH_CANCEL, ui::SCALE_FACTOR_100P }, 798 { "searchCancel", IDR_SEARCH_CANCEL, ui::SCALE_FACTOR_100P },
797 { "searchCancelPressed", IDR_SEARCH_CANCEL_PRESSED, ui::SCALE_FACTOR_100P }, 799 { "searchCancelPressed", IDR_SEARCH_CANCEL_PRESSED, ui::SCALE_FACTOR_100P },
798 { "searchMagnifier", IDR_SEARCH_MAGNIFIER, ui::SCALE_FACTOR_100P }, 800 { "searchMagnifier", IDR_SEARCH_MAGNIFIER, ui::SCALE_FACTOR_100P },
(...skipping 415 matching lines...) Expand 10 before | Expand all | Expand 10 after
1214 } 1216 }
1215 1217
1216 // static 1218 // static
1217 void BlinkPlatformImpl::DestroyCurrentThread(void* thread) { 1219 void BlinkPlatformImpl::DestroyCurrentThread(void* thread) {
1218 WebThreadImplForMessageLoop* impl = 1220 WebThreadImplForMessageLoop* impl =
1219 static_cast<WebThreadImplForMessageLoop*>(thread); 1221 static_cast<WebThreadImplForMessageLoop*>(thread);
1220 delete impl; 1222 delete impl;
1221 } 1223 }
1222 1224
1223 } // namespace content 1225 } // namespace content
OLDNEW
« no previous file with comments | « content/app/resources/default_100_percent/mediaplayer_overlay_cast_off.png ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698