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

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

Issue 349923007: Implement media Cast button in Blink (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Rebase, now that the Blink patch has landed. Created 6 years, 3 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
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 207 matching lines...) Expand 10 before | Expand all | Expand 10 after
218 case WebLocalizedString::AXMediaStatusDisplay: 218 case WebLocalizedString::AXMediaStatusDisplay:
219 return IDS_AX_MEDIA_STATUS_DISPLAY; 219 return IDS_AX_MEDIA_STATUS_DISPLAY;
220 case WebLocalizedString::AXMediaEnterFullscreenButton: 220 case WebLocalizedString::AXMediaEnterFullscreenButton:
221 return IDS_AX_MEDIA_ENTER_FULL_SCREEN_BUTTON; 221 return IDS_AX_MEDIA_ENTER_FULL_SCREEN_BUTTON;
222 case WebLocalizedString::AXMediaExitFullscreenButton: 222 case WebLocalizedString::AXMediaExitFullscreenButton:
223 return IDS_AX_MEDIA_EXIT_FULL_SCREEN_BUTTON; 223 return IDS_AX_MEDIA_EXIT_FULL_SCREEN_BUTTON;
224 case WebLocalizedString::AXMediaShowClosedCaptionsButton: 224 case WebLocalizedString::AXMediaShowClosedCaptionsButton:
225 return IDS_AX_MEDIA_SHOW_CLOSED_CAPTIONS_BUTTON; 225 return IDS_AX_MEDIA_SHOW_CLOSED_CAPTIONS_BUTTON;
226 case WebLocalizedString::AXMediaHideClosedCaptionsButton: 226 case WebLocalizedString::AXMediaHideClosedCaptionsButton:
227 return IDS_AX_MEDIA_HIDE_CLOSED_CAPTIONS_BUTTON; 227 return IDS_AX_MEDIA_HIDE_CLOSED_CAPTIONS_BUTTON;
228 case WebLocalizedString::AxMediaCastOffButton:
229 return IDS_AX_MEDIA_CAST_OFF_BUTTON;
230 case WebLocalizedString::AxMediaCastOnButton:
231 return IDS_AX_MEDIA_CAST_ON_BUTTON;
228 case WebLocalizedString::AXMediaAudioElementHelp: 232 case WebLocalizedString::AXMediaAudioElementHelp:
229 return IDS_AX_MEDIA_AUDIO_ELEMENT_HELP; 233 return IDS_AX_MEDIA_AUDIO_ELEMENT_HELP;
230 case WebLocalizedString::AXMediaVideoElementHelp: 234 case WebLocalizedString::AXMediaVideoElementHelp:
231 return IDS_AX_MEDIA_VIDEO_ELEMENT_HELP; 235 return IDS_AX_MEDIA_VIDEO_ELEMENT_HELP;
232 case WebLocalizedString::AXMediaMuteButtonHelp: 236 case WebLocalizedString::AXMediaMuteButtonHelp:
233 return IDS_AX_MEDIA_MUTE_BUTTON_HELP; 237 return IDS_AX_MEDIA_MUTE_BUTTON_HELP;
234 case WebLocalizedString::AXMediaUnMuteButtonHelp: 238 case WebLocalizedString::AXMediaUnMuteButtonHelp:
235 return IDS_AX_MEDIA_UNMUTE_BUTTON_HELP; 239 return IDS_AX_MEDIA_UNMUTE_BUTTON_HELP;
236 case WebLocalizedString::AXMediaPlayButtonHelp: 240 case WebLocalizedString::AXMediaPlayButtonHelp:
237 return IDS_AX_MEDIA_PLAY_BUTTON_HELP; 241 return IDS_AX_MEDIA_PLAY_BUTTON_HELP;
(...skipping 10 matching lines...) Expand all
248 case WebLocalizedString::AXMediaStatusDisplayHelp: 252 case WebLocalizedString::AXMediaStatusDisplayHelp:
249 return IDS_AX_MEDIA_STATUS_DISPLAY_HELP; 253 return IDS_AX_MEDIA_STATUS_DISPLAY_HELP;
250 case WebLocalizedString::AXMediaEnterFullscreenButtonHelp: 254 case WebLocalizedString::AXMediaEnterFullscreenButtonHelp:
251 return IDS_AX_MEDIA_ENTER_FULL_SCREEN_BUTTON_HELP; 255 return IDS_AX_MEDIA_ENTER_FULL_SCREEN_BUTTON_HELP;
252 case WebLocalizedString::AXMediaExitFullscreenButtonHelp: 256 case WebLocalizedString::AXMediaExitFullscreenButtonHelp:
253 return IDS_AX_MEDIA_EXIT_FULL_SCREEN_BUTTON_HELP; 257 return IDS_AX_MEDIA_EXIT_FULL_SCREEN_BUTTON_HELP;
254 case WebLocalizedString::AXMediaShowClosedCaptionsButtonHelp: 258 case WebLocalizedString::AXMediaShowClosedCaptionsButtonHelp:
255 return IDS_AX_MEDIA_SHOW_CLOSED_CAPTIONS_BUTTON_HELP; 259 return IDS_AX_MEDIA_SHOW_CLOSED_CAPTIONS_BUTTON_HELP;
256 case WebLocalizedString::AXMediaHideClosedCaptionsButtonHelp: 260 case WebLocalizedString::AXMediaHideClosedCaptionsButtonHelp:
257 return IDS_AX_MEDIA_HIDE_CLOSED_CAPTIONS_BUTTON_HELP; 261 return IDS_AX_MEDIA_HIDE_CLOSED_CAPTIONS_BUTTON_HELP;
262 case WebLocalizedString::AxMediaCastOffButtonHelp:
263 return IDS_AX_MEDIA_CAST_OFF_BUTTON_HELP;
264 case WebLocalizedString::AxMediaCastOnButtonHelp:
265 return IDS_AX_MEDIA_CAST_ON_BUTTON_HELP;
258 case WebLocalizedString::AXMillisecondFieldText: 266 case WebLocalizedString::AXMillisecondFieldText:
259 return IDS_AX_MILLISECOND_FIELD_TEXT; 267 return IDS_AX_MILLISECOND_FIELD_TEXT;
260 case WebLocalizedString::AXMinuteFieldText: 268 case WebLocalizedString::AXMinuteFieldText:
261 return IDS_AX_MINUTE_FIELD_TEXT; 269 return IDS_AX_MINUTE_FIELD_TEXT;
262 case WebLocalizedString::AXMonthFieldText: 270 case WebLocalizedString::AXMonthFieldText:
263 return IDS_AX_MONTH_FIELD_TEXT; 271 return IDS_AX_MONTH_FIELD_TEXT;
264 case WebLocalizedString::AXRadioButtonActionVerb: 272 case WebLocalizedString::AXRadioButtonActionVerb:
265 return IDS_AX_RADIO_BUTTON_ACTION_VERB; 273 return IDS_AX_RADIO_BUTTON_ACTION_VERB;
266 case WebLocalizedString::AXSecondFieldText: 274 case WebLocalizedString::AXSecondFieldText:
267 return IDS_AX_SECOND_FIELD_TEXT; 275 return IDS_AX_SECOND_FIELD_TEXT;
(...skipping 485 matching lines...) Expand 10 before | Expand all | Expand 10 after
753 { "mediaplayerClosedCaptionDown", 761 { "mediaplayerClosedCaptionDown",
754 IDR_MEDIAPLAYER_CLOSEDCAPTION_BUTTON_DOWN, ui::SCALE_FACTOR_100P }, 762 IDR_MEDIAPLAYER_CLOSEDCAPTION_BUTTON_DOWN, ui::SCALE_FACTOR_100P },
755 { "mediaplayerClosedCaptionDisabled", 763 { "mediaplayerClosedCaptionDisabled",
756 IDR_MEDIAPLAYER_CLOSEDCAPTION_BUTTON_DISABLED, ui::SCALE_FACTOR_100P }, 764 IDR_MEDIAPLAYER_CLOSEDCAPTION_BUTTON_DISABLED, ui::SCALE_FACTOR_100P },
757 { "mediaplayerFullscreen", 765 { "mediaplayerFullscreen",
758 IDR_MEDIAPLAYER_FULLSCREEN_BUTTON, ui::SCALE_FACTOR_100P }, 766 IDR_MEDIAPLAYER_FULLSCREEN_BUTTON, ui::SCALE_FACTOR_100P },
759 { "mediaplayerFullscreenHover", 767 { "mediaplayerFullscreenHover",
760 IDR_MEDIAPLAYER_FULLSCREEN_BUTTON_HOVER, ui::SCALE_FACTOR_100P }, 768 IDR_MEDIAPLAYER_FULLSCREEN_BUTTON_HOVER, ui::SCALE_FACTOR_100P },
761 { "mediaplayerFullscreenDown", 769 { "mediaplayerFullscreenDown",
762 IDR_MEDIAPLAYER_FULLSCREEN_BUTTON_DOWN, ui::SCALE_FACTOR_100P }, 770 IDR_MEDIAPLAYER_FULLSCREEN_BUTTON_DOWN, ui::SCALE_FACTOR_100P },
771 { "mediaplayerCastOff",
772 IDR_MEDIAPLAYER_CAST_BUTTON_OFF, ui::SCALE_FACTOR_100P },
773 { "mediaplayerCastOn",
774 IDR_MEDIAPLAYER_CAST_BUTTON_ON, ui::SCALE_FACTOR_100P },
763 { "mediaplayerFullscreenDisabled", 775 { "mediaplayerFullscreenDisabled",
764 IDR_MEDIAPLAYER_FULLSCREEN_BUTTON_DISABLED, ui::SCALE_FACTOR_100P }, 776 IDR_MEDIAPLAYER_FULLSCREEN_BUTTON_DISABLED, ui::SCALE_FACTOR_100P },
765 { "mediaplayerOverlayPlay", 777 { "mediaplayerOverlayPlay",
766 IDR_MEDIAPLAYER_OVERLAY_PLAY_BUTTON, ui::SCALE_FACTOR_100P }, 778 IDR_MEDIAPLAYER_OVERLAY_PLAY_BUTTON, ui::SCALE_FACTOR_100P },
767 #if defined(OS_MACOSX) 779 #if defined(OS_MACOSX)
768 { "overhangPattern", IDR_OVERHANG_PATTERN, ui::SCALE_FACTOR_100P }, 780 { "overhangPattern", IDR_OVERHANG_PATTERN, ui::SCALE_FACTOR_100P },
769 { "overhangShadow", IDR_OVERHANG_SHADOW, ui::SCALE_FACTOR_100P }, 781 { "overhangShadow", IDR_OVERHANG_SHADOW, ui::SCALE_FACTOR_100P },
770 #endif 782 #endif
771 { "panIcon", IDR_PAN_SCROLL_ICON, ui::SCALE_FACTOR_100P }, 783 { "panIcon", IDR_PAN_SCROLL_ICON, ui::SCALE_FACTOR_100P },
772 { "searchCancel", IDR_SEARCH_CANCEL, ui::SCALE_FACTOR_100P }, 784 { "searchCancel", IDR_SEARCH_CANCEL, ui::SCALE_FACTOR_100P },
(...skipping 416 matching lines...) Expand 10 before | Expand all | Expand 10 after
1189 } 1201 }
1190 1202
1191 // static 1203 // static
1192 void BlinkPlatformImpl::DestroyCurrentThread(void* thread) { 1204 void BlinkPlatformImpl::DestroyCurrentThread(void* thread) {
1193 WebThreadImplForMessageLoop* impl = 1205 WebThreadImplForMessageLoop* impl =
1194 static_cast<WebThreadImplForMessageLoop*>(thread); 1206 static_cast<WebThreadImplForMessageLoop*>(thread);
1195 delete impl; 1207 delete impl;
1196 } 1208 }
1197 1209
1198 } // namespace content 1210 } // namespace content
OLDNEW
« no previous file with comments | « content/browser/media/media_web_contents_observer.cc ('k') | content/common/media/media_player_messages_android.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698