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

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: Rebased. 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
« no previous file with comments | « content/app/strings/content_strings.grd ('k') | media/base/media_observer.h » ('j') | 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 <memory> 9 #include <memory>
10 #include <vector> 10 #include <vector>
(...skipping 194 matching lines...) Expand 10 before | Expand all | Expand 10 after
205 case WebLocalizedString::kFileButtonChooseFileLabel: 205 case WebLocalizedString::kFileButtonChooseFileLabel:
206 return IDS_FORM_FILE_BUTTON_LABEL; 206 return IDS_FORM_FILE_BUTTON_LABEL;
207 case WebLocalizedString::kFileButtonChooseMultipleFilesLabel: 207 case WebLocalizedString::kFileButtonChooseMultipleFilesLabel:
208 return IDS_FORM_MULTIPLE_FILES_BUTTON_LABEL; 208 return IDS_FORM_MULTIPLE_FILES_BUTTON_LABEL;
209 case WebLocalizedString::kFileButtonNoFileSelectedLabel: 209 case WebLocalizedString::kFileButtonNoFileSelectedLabel:
210 return IDS_FORM_FILE_NO_FILE_LABEL; 210 return IDS_FORM_FILE_NO_FILE_LABEL;
211 case WebLocalizedString::kInputElementAltText: 211 case WebLocalizedString::kInputElementAltText:
212 return IDS_FORM_INPUT_ALT; 212 return IDS_FORM_INPUT_ALT;
213 case WebLocalizedString::kMissingPluginText: 213 case WebLocalizedString::kMissingPluginText:
214 return IDS_PLUGIN_INITIALIZATION_ERROR; 214 return IDS_PLUGIN_INITIALIZATION_ERROR;
215 case WebLocalizedString::kMediaRemotingDisableText:
216 return IDS_MEDIA_REMOTING_DISABLE_TEXT;
217 case WebLocalizedString::kMediaRemotingCastText:
218 return IDS_MEDIA_REMOTING_CAST_TEXT;
215 case WebLocalizedString::kMultipleFileUploadText: 219 case WebLocalizedString::kMultipleFileUploadText:
216 return IDS_FORM_FILE_MULTIPLE_UPLOAD; 220 return IDS_FORM_FILE_MULTIPLE_UPLOAD;
217 case WebLocalizedString::kOtherColorLabel: 221 case WebLocalizedString::kOtherColorLabel:
218 return IDS_FORM_OTHER_COLOR_LABEL; 222 return IDS_FORM_OTHER_COLOR_LABEL;
219 case WebLocalizedString::kOtherDateLabel: 223 case WebLocalizedString::kOtherDateLabel:
220 return IDS_FORM_OTHER_DATE_LABEL; 224 return IDS_FORM_OTHER_DATE_LABEL;
221 case WebLocalizedString::kOtherMonthLabel: 225 case WebLocalizedString::kOtherMonthLabel:
222 return IDS_FORM_OTHER_MONTH_LABEL; 226 return IDS_FORM_OTHER_MONTH_LABEL;
223 case WebLocalizedString::kOtherTimeLabel: 227 case WebLocalizedString::kOtherTimeLabel:
224 return IDS_FORM_OTHER_TIME_LABEL; 228 return IDS_FORM_OTHER_TIME_LABEL;
(...skipping 291 matching lines...) Expand 10 before | Expand all | Expand 10 after
516 {"mediaplayerExitFullscreen", IDR_MEDIAPLAYER_EXIT_FULLSCREEN_BUTTON, 520 {"mediaplayerExitFullscreen", IDR_MEDIAPLAYER_EXIT_FULLSCREEN_BUTTON,
517 ui::SCALE_FACTOR_100P, false}, 521 ui::SCALE_FACTOR_100P, false},
518 {"mediaplayerCastOff", IDR_MEDIAPLAYER_CAST_BUTTON_OFF, 522 {"mediaplayerCastOff", IDR_MEDIAPLAYER_CAST_BUTTON_OFF,
519 ui::SCALE_FACTOR_100P, false}, 523 ui::SCALE_FACTOR_100P, false},
520 {"mediaplayerCastOn", IDR_MEDIAPLAYER_CAST_BUTTON_ON, ui::SCALE_FACTOR_100P, 524 {"mediaplayerCastOn", IDR_MEDIAPLAYER_CAST_BUTTON_ON, ui::SCALE_FACTOR_100P,
521 false}, 525 false},
522 {"mediaplayerOverlayCastOff", IDR_MEDIAPLAYER_OVERLAY_CAST_BUTTON_OFF, 526 {"mediaplayerOverlayCastOff", IDR_MEDIAPLAYER_OVERLAY_CAST_BUTTON_OFF,
523 ui::SCALE_FACTOR_100P, false}, 527 ui::SCALE_FACTOR_100P, false},
524 {"mediaplayerOverlayPlay", IDR_MEDIAPLAYER_OVERLAY_PLAY_BUTTON, 528 {"mediaplayerOverlayPlay", IDR_MEDIAPLAYER_OVERLAY_PLAY_BUTTON,
525 ui::SCALE_FACTOR_100P, false}, 529 ui::SCALE_FACTOR_100P, false},
530 {"mediaRemotingCastIcon", IDR_MEDIA_REMOTING_CAST_ICON,
531 ui::SCALE_FACTOR_100P, false},
526 {"mediaplayerTrackSelectionCheckmark", 532 {"mediaplayerTrackSelectionCheckmark",
527 IDR_MEDIAPLAYER_TRACKSELECTION_CHECKMARK, ui::SCALE_FACTOR_100P, false}, 533 IDR_MEDIAPLAYER_TRACKSELECTION_CHECKMARK, ui::SCALE_FACTOR_100P, false},
528 {"mediaplayerClosedCaptionsIcon", IDR_MEDIAPLAYER_CLOSEDCAPTIONS_ICON, 534 {"mediaplayerClosedCaptionsIcon", IDR_MEDIAPLAYER_CLOSEDCAPTIONS_ICON,
529 ui::SCALE_FACTOR_100P, false}, 535 ui::SCALE_FACTOR_100P, false},
530 {"mediaplayerSubtitlesIcon", IDR_MEDIAPLAYER_SUBTITLES_ICON, 536 {"mediaplayerSubtitlesIcon", IDR_MEDIAPLAYER_SUBTITLES_ICON,
531 ui::SCALE_FACTOR_100P, false}, 537 ui::SCALE_FACTOR_100P, false},
532 {"mediaplayerOverflowMenu", IDR_MEDIAPLAYER_OVERFLOW_MENU_ICON, 538 {"mediaplayerOverflowMenu", IDR_MEDIAPLAYER_OVERFLOW_MENU_ICON,
533 ui::SCALE_FACTOR_100P, false}, 539 ui::SCALE_FACTOR_100P, false},
534 {"mediaplayerDownloadIcon", IDR_MEDIAPLAYER_DOWNLOAD_ICON, 540 {"mediaplayerDownloadIcon", IDR_MEDIAPLAYER_DOWNLOAD_ICON,
535 ui::SCALE_FACTOR_100P, false}, 541 ui::SCALE_FACTOR_100P, false},
(...skipping 306 matching lines...) Expand 10 before | Expand all | Expand 10 after
842 blink::WebFeaturePolicy* BlinkPlatformImpl::DuplicateFeaturePolicyWithOrigin( 848 blink::WebFeaturePolicy* BlinkPlatformImpl::DuplicateFeaturePolicyWithOrigin(
843 const blink::WebFeaturePolicy& policy, 849 const blink::WebFeaturePolicy& policy,
844 const blink::WebSecurityOrigin& new_origin) { 850 const blink::WebSecurityOrigin& new_origin) {
845 std::unique_ptr<FeaturePolicy> new_policy = 851 std::unique_ptr<FeaturePolicy> new_policy =
846 FeaturePolicy::CreateFromPolicyWithOrigin( 852 FeaturePolicy::CreateFromPolicyWithOrigin(
847 static_cast<const FeaturePolicy&>(policy), url::Origin(new_origin)); 853 static_cast<const FeaturePolicy&>(policy), url::Origin(new_origin));
848 return new_policy.release(); 854 return new_policy.release();
849 } 855 }
850 856
851 } // namespace content 857 } // namespace content
OLDNEW
« no previous file with comments | « content/app/strings/content_strings.grd ('k') | media/base/media_observer.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698