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

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

Issue 2767823002: Media Remoting: Add interstitial elements to media element shadow dom. (Closed)
Patch Set: Updated with new UX design. Created 3 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
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 <memory> 9 #include <memory>
10 #include <vector> 10 #include <vector>
(...skipping 117 matching lines...) Expand 10 before | Expand all | Expand 10 after
128 case WebLocalizedString::kAXMediaShowClosedCaptionsButton: 128 case WebLocalizedString::kAXMediaShowClosedCaptionsButton:
129 return IDS_AX_MEDIA_SHOW_CLOSED_CAPTIONS_BUTTON; 129 return IDS_AX_MEDIA_SHOW_CLOSED_CAPTIONS_BUTTON;
130 case WebLocalizedString::kAXMediaHideClosedCaptionsButton: 130 case WebLocalizedString::kAXMediaHideClosedCaptionsButton:
131 return IDS_AX_MEDIA_HIDE_CLOSED_CAPTIONS_BUTTON; 131 return IDS_AX_MEDIA_HIDE_CLOSED_CAPTIONS_BUTTON;
132 case WebLocalizedString::kAXMediaCastOffButton: 132 case WebLocalizedString::kAXMediaCastOffButton:
133 return IDS_AX_MEDIA_CAST_OFF_BUTTON; 133 return IDS_AX_MEDIA_CAST_OFF_BUTTON;
134 case WebLocalizedString::kAXMediaCastOnButton: 134 case WebLocalizedString::kAXMediaCastOnButton:
135 return IDS_AX_MEDIA_CAST_ON_BUTTON; 135 return IDS_AX_MEDIA_CAST_ON_BUTTON;
136 case WebLocalizedString::kAXMediaDownloadButton: 136 case WebLocalizedString::kAXMediaDownloadButton:
137 return IDS_AX_MEDIA_DOWNLOAD_BUTTON; 137 return IDS_AX_MEDIA_DOWNLOAD_BUTTON;
138 case WebLocalizedString::kAXMediaRemotingCastIcon:
139 return IDS_AX_MEDIA_REMOTING_CAST_ICON;
138 case WebLocalizedString::kAXMediaOverflowButton: 140 case WebLocalizedString::kAXMediaOverflowButton:
139 return IDS_AX_MEDIA_OVERFLOW_BUTTON; 141 return IDS_AX_MEDIA_OVERFLOW_BUTTON;
140 case WebLocalizedString::kAXMediaAudioElementHelp: 142 case WebLocalizedString::kAXMediaAudioElementHelp:
141 return IDS_AX_MEDIA_AUDIO_ELEMENT_HELP; 143 return IDS_AX_MEDIA_AUDIO_ELEMENT_HELP;
142 case WebLocalizedString::kAXMediaVideoElementHelp: 144 case WebLocalizedString::kAXMediaVideoElementHelp:
143 return IDS_AX_MEDIA_VIDEO_ELEMENT_HELP; 145 return IDS_AX_MEDIA_VIDEO_ELEMENT_HELP;
144 case WebLocalizedString::kAXMediaMuteButtonHelp: 146 case WebLocalizedString::kAXMediaMuteButtonHelp:
145 return IDS_AX_MEDIA_MUTE_BUTTON_HELP; 147 return IDS_AX_MEDIA_MUTE_BUTTON_HELP;
146 case WebLocalizedString::kAXMediaUnMuteButtonHelp: 148 case WebLocalizedString::kAXMediaUnMuteButtonHelp:
147 return IDS_AX_MEDIA_UNMUTE_BUTTON_HELP; 149 return IDS_AX_MEDIA_UNMUTE_BUTTON_HELP;
(...skipping 58 matching lines...) Expand 10 before | Expand all | Expand 10 after
206 case WebLocalizedString::kFileButtonChooseFileLabel: 208 case WebLocalizedString::kFileButtonChooseFileLabel:
207 return IDS_FORM_FILE_BUTTON_LABEL; 209 return IDS_FORM_FILE_BUTTON_LABEL;
208 case WebLocalizedString::kFileButtonChooseMultipleFilesLabel: 210 case WebLocalizedString::kFileButtonChooseMultipleFilesLabel:
209 return IDS_FORM_MULTIPLE_FILES_BUTTON_LABEL; 211 return IDS_FORM_MULTIPLE_FILES_BUTTON_LABEL;
210 case WebLocalizedString::kFileButtonNoFileSelectedLabel: 212 case WebLocalizedString::kFileButtonNoFileSelectedLabel:
211 return IDS_FORM_FILE_NO_FILE_LABEL; 213 return IDS_FORM_FILE_NO_FILE_LABEL;
212 case WebLocalizedString::kInputElementAltText: 214 case WebLocalizedString::kInputElementAltText:
213 return IDS_FORM_INPUT_ALT; 215 return IDS_FORM_INPUT_ALT;
214 case WebLocalizedString::kMissingPluginText: 216 case WebLocalizedString::kMissingPluginText:
215 return IDS_PLUGIN_INITIALIZATION_ERROR; 217 return IDS_PLUGIN_INITIALIZATION_ERROR;
218 case WebLocalizedString::kMediaRemotingDisableText:
219 return IDS_MEDIA_REMOTING_DISABLE_TEXT;
220 case WebLocalizedString::kMediaRemotingCastText:
221 return IDS_MEDIA_REMOTING_CAST_TEXT;
216 case WebLocalizedString::kMultipleFileUploadText: 222 case WebLocalizedString::kMultipleFileUploadText:
217 return IDS_FORM_FILE_MULTIPLE_UPLOAD; 223 return IDS_FORM_FILE_MULTIPLE_UPLOAD;
218 case WebLocalizedString::kOtherColorLabel: 224 case WebLocalizedString::kOtherColorLabel:
219 return IDS_FORM_OTHER_COLOR_LABEL; 225 return IDS_FORM_OTHER_COLOR_LABEL;
220 case WebLocalizedString::kOtherDateLabel: 226 case WebLocalizedString::kOtherDateLabel:
221 return IDS_FORM_OTHER_DATE_LABEL; 227 return IDS_FORM_OTHER_DATE_LABEL;
222 case WebLocalizedString::kOtherMonthLabel: 228 case WebLocalizedString::kOtherMonthLabel:
223 return IDS_FORM_OTHER_MONTH_LABEL; 229 return IDS_FORM_OTHER_MONTH_LABEL;
224 case WebLocalizedString::kOtherTimeLabel: 230 case WebLocalizedString::kOtherTimeLabel:
225 return IDS_FORM_OTHER_TIME_LABEL; 231 return IDS_FORM_OTHER_TIME_LABEL;
(...skipping 290 matching lines...) Expand 10 before | Expand all | Expand 10 after
516 {"mediaplayerExitFullscreen", IDR_MEDIAPLAYER_EXIT_FULLSCREEN_BUTTON, 522 {"mediaplayerExitFullscreen", IDR_MEDIAPLAYER_EXIT_FULLSCREEN_BUTTON,
517 ui::SCALE_FACTOR_100P, false}, 523 ui::SCALE_FACTOR_100P, false},
518 {"mediaplayerCastOff", IDR_MEDIAPLAYER_CAST_BUTTON_OFF, 524 {"mediaplayerCastOff", IDR_MEDIAPLAYER_CAST_BUTTON_OFF,
519 ui::SCALE_FACTOR_100P, false}, 525 ui::SCALE_FACTOR_100P, false},
520 {"mediaplayerCastOn", IDR_MEDIAPLAYER_CAST_BUTTON_ON, ui::SCALE_FACTOR_100P, 526 {"mediaplayerCastOn", IDR_MEDIAPLAYER_CAST_BUTTON_ON, ui::SCALE_FACTOR_100P,
521 false}, 527 false},
522 {"mediaplayerOverlayCastOff", IDR_MEDIAPLAYER_OVERLAY_CAST_BUTTON_OFF, 528 {"mediaplayerOverlayCastOff", IDR_MEDIAPLAYER_OVERLAY_CAST_BUTTON_OFF,
523 ui::SCALE_FACTOR_100P, false}, 529 ui::SCALE_FACTOR_100P, false},
524 {"mediaplayerOverlayPlay", IDR_MEDIAPLAYER_OVERLAY_PLAY_BUTTON, 530 {"mediaplayerOverlayPlay", IDR_MEDIAPLAYER_OVERLAY_PLAY_BUTTON,
525 ui::SCALE_FACTOR_100P, false}, 531 ui::SCALE_FACTOR_100P, false},
532 {"mediaremotingCast", IDR_MEDIA_REMOTING_CAST_ICON, ui::SCALE_FACTOR_100P,
liberato (no reviews please) 2017/04/12 21:57:44 please alphabetize.
xjz 2017/04/13 00:08:48 Renamed it as mediaRemotingCastIcon
533 false},
526 {"mediaplayerTrackSelectionCheckmark", 534 {"mediaplayerTrackSelectionCheckmark",
527 IDR_MEDIAPLAYER_TRACKSELECTION_CHECKMARK, ui::SCALE_FACTOR_100P, false}, 535 IDR_MEDIAPLAYER_TRACKSELECTION_CHECKMARK, ui::SCALE_FACTOR_100P, false},
528 {"mediaplayerClosedCaptionsIcon", IDR_MEDIAPLAYER_CLOSEDCAPTIONS_ICON, 536 {"mediaplayerClosedCaptionsIcon", IDR_MEDIAPLAYER_CLOSEDCAPTIONS_ICON,
529 ui::SCALE_FACTOR_100P, false}, 537 ui::SCALE_FACTOR_100P, false},
530 {"mediaplayerSubtitlesIcon", IDR_MEDIAPLAYER_SUBTITLES_ICON, 538 {"mediaplayerSubtitlesIcon", IDR_MEDIAPLAYER_SUBTITLES_ICON,
531 ui::SCALE_FACTOR_100P, false}, 539 ui::SCALE_FACTOR_100P, false},
532 {"mediaplayerOverflowMenu", IDR_MEDIAPLAYER_OVERFLOW_MENU_ICON, 540 {"mediaplayerOverflowMenu", IDR_MEDIAPLAYER_OVERFLOW_MENU_ICON,
533 ui::SCALE_FACTOR_100P, false}, 541 ui::SCALE_FACTOR_100P, false},
534 {"mediaplayerDownloadIcon", IDR_MEDIAPLAYER_DOWNLOAD_ICON, 542 {"mediaplayerDownloadIcon", IDR_MEDIAPLAYER_DOWNLOAD_ICON,
535 ui::SCALE_FACTOR_100P, false}, 543 ui::SCALE_FACTOR_100P, false},
(...skipping 306 matching lines...) Expand 10 before | Expand all | Expand 10 after
842 blink::WebFeaturePolicy* BlinkPlatformImpl::DuplicateFeaturePolicyWithOrigin( 850 blink::WebFeaturePolicy* BlinkPlatformImpl::DuplicateFeaturePolicyWithOrigin(
843 const blink::WebFeaturePolicy& policy, 851 const blink::WebFeaturePolicy& policy,
844 const blink::WebSecurityOrigin& new_origin) { 852 const blink::WebSecurityOrigin& new_origin) {
845 std::unique_ptr<FeaturePolicy> new_policy = 853 std::unique_ptr<FeaturePolicy> new_policy =
846 FeaturePolicy::CreateFromPolicyWithOrigin( 854 FeaturePolicy::CreateFromPolicyWithOrigin(
847 static_cast<const FeaturePolicy&>(policy), url::Origin(new_origin)); 855 static_cast<const FeaturePolicy&>(policy), url::Origin(new_origin));
848 return new_policy.release(); 856 return new_policy.release();
849 } 857 }
850 858
851 } // namespace content 859 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698