OLD | NEW |
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 116 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
127 case WebLocalizedString::AXMediaExitFullscreenButton: | 127 case WebLocalizedString::AXMediaExitFullscreenButton: |
128 return IDS_AX_MEDIA_EXIT_FULL_SCREEN_BUTTON; | 128 return IDS_AX_MEDIA_EXIT_FULL_SCREEN_BUTTON; |
129 case WebLocalizedString::AXMediaShowClosedCaptionsButton: | 129 case WebLocalizedString::AXMediaShowClosedCaptionsButton: |
130 return IDS_AX_MEDIA_SHOW_CLOSED_CAPTIONS_BUTTON; | 130 return IDS_AX_MEDIA_SHOW_CLOSED_CAPTIONS_BUTTON; |
131 case WebLocalizedString::AXMediaHideClosedCaptionsButton: | 131 case WebLocalizedString::AXMediaHideClosedCaptionsButton: |
132 return IDS_AX_MEDIA_HIDE_CLOSED_CAPTIONS_BUTTON; | 132 return IDS_AX_MEDIA_HIDE_CLOSED_CAPTIONS_BUTTON; |
133 case WebLocalizedString::AXMediaCastOffButton: | 133 case WebLocalizedString::AXMediaCastOffButton: |
134 return IDS_AX_MEDIA_CAST_OFF_BUTTON; | 134 return IDS_AX_MEDIA_CAST_OFF_BUTTON; |
135 case WebLocalizedString::AXMediaCastOnButton: | 135 case WebLocalizedString::AXMediaCastOnButton: |
136 return IDS_AX_MEDIA_CAST_ON_BUTTON; | 136 return IDS_AX_MEDIA_CAST_ON_BUTTON; |
| 137 case WebLocalizedString::AXMediaRemotingDisableButton: |
| 138 return IDS_AX_MEDIA_REMOTING_DISABLE_BUTTON; |
137 case WebLocalizedString::AXMediaDownloadButton: | 139 case WebLocalizedString::AXMediaDownloadButton: |
138 return IDS_AX_MEDIA_DOWNLOAD_BUTTON; | 140 return IDS_AX_MEDIA_DOWNLOAD_BUTTON; |
139 case WebLocalizedString::AXMediaOverflowButton: | 141 case WebLocalizedString::AXMediaOverflowButton: |
140 return IDS_AX_MEDIA_OVERFLOW_BUTTON; | 142 return IDS_AX_MEDIA_OVERFLOW_BUTTON; |
141 case WebLocalizedString::AXMediaAudioElementHelp: | 143 case WebLocalizedString::AXMediaAudioElementHelp: |
142 return IDS_AX_MEDIA_AUDIO_ELEMENT_HELP; | 144 return IDS_AX_MEDIA_AUDIO_ELEMENT_HELP; |
143 case WebLocalizedString::AXMediaVideoElementHelp: | 145 case WebLocalizedString::AXMediaVideoElementHelp: |
144 return IDS_AX_MEDIA_VIDEO_ELEMENT_HELP; | 146 return IDS_AX_MEDIA_VIDEO_ELEMENT_HELP; |
145 case WebLocalizedString::AXMediaMuteButtonHelp: | 147 case WebLocalizedString::AXMediaMuteButtonHelp: |
146 return IDS_AX_MEDIA_MUTE_BUTTON_HELP; | 148 return IDS_AX_MEDIA_MUTE_BUTTON_HELP; |
(...skipping 20 matching lines...) Expand all Loading... |
167 case WebLocalizedString::AXMediaExitFullscreenButtonHelp: | 169 case WebLocalizedString::AXMediaExitFullscreenButtonHelp: |
168 return IDS_AX_MEDIA_EXIT_FULL_SCREEN_BUTTON_HELP; | 170 return IDS_AX_MEDIA_EXIT_FULL_SCREEN_BUTTON_HELP; |
169 case WebLocalizedString::AXMediaShowClosedCaptionsButtonHelp: | 171 case WebLocalizedString::AXMediaShowClosedCaptionsButtonHelp: |
170 return IDS_AX_MEDIA_SHOW_CLOSED_CAPTIONS_BUTTON_HELP; | 172 return IDS_AX_MEDIA_SHOW_CLOSED_CAPTIONS_BUTTON_HELP; |
171 case WebLocalizedString::AXMediaHideClosedCaptionsButtonHelp: | 173 case WebLocalizedString::AXMediaHideClosedCaptionsButtonHelp: |
172 return IDS_AX_MEDIA_HIDE_CLOSED_CAPTIONS_BUTTON_HELP; | 174 return IDS_AX_MEDIA_HIDE_CLOSED_CAPTIONS_BUTTON_HELP; |
173 case WebLocalizedString::AXMediaCastOffButtonHelp: | 175 case WebLocalizedString::AXMediaCastOffButtonHelp: |
174 return IDS_AX_MEDIA_CAST_OFF_BUTTON_HELP; | 176 return IDS_AX_MEDIA_CAST_OFF_BUTTON_HELP; |
175 case WebLocalizedString::AXMediaCastOnButtonHelp: | 177 case WebLocalizedString::AXMediaCastOnButtonHelp: |
176 return IDS_AX_MEDIA_CAST_ON_BUTTON_HELP; | 178 return IDS_AX_MEDIA_CAST_ON_BUTTON_HELP; |
| 179 case WebLocalizedString::AXMediaRemotingDisableButtonHelp: |
| 180 return IDS_AX_MEDIA_REMOTING_DISABLE_BUTTON_HELP; |
177 case WebLocalizedString::AXMediaOverflowButtonHelp: | 181 case WebLocalizedString::AXMediaOverflowButtonHelp: |
178 return IDS_AX_MEDIA_OVERFLOW_BUTTON_HELP; | 182 return IDS_AX_MEDIA_OVERFLOW_BUTTON_HELP; |
179 case WebLocalizedString::AXMillisecondFieldText: | 183 case WebLocalizedString::AXMillisecondFieldText: |
180 return IDS_AX_MILLISECOND_FIELD_TEXT; | 184 return IDS_AX_MILLISECOND_FIELD_TEXT; |
181 case WebLocalizedString::AXMinuteFieldText: | 185 case WebLocalizedString::AXMinuteFieldText: |
182 return IDS_AX_MINUTE_FIELD_TEXT; | 186 return IDS_AX_MINUTE_FIELD_TEXT; |
183 case WebLocalizedString::AXMonthFieldText: | 187 case WebLocalizedString::AXMonthFieldText: |
184 return IDS_AX_MONTH_FIELD_TEXT; | 188 return IDS_AX_MONTH_FIELD_TEXT; |
185 case WebLocalizedString::AXSecondFieldText: | 189 case WebLocalizedString::AXSecondFieldText: |
186 return IDS_AX_SECOND_FIELD_TEXT; | 190 return IDS_AX_SECOND_FIELD_TEXT; |
(...skipping 298 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
485 | 489 |
486 struct DataResource { | 490 struct DataResource { |
487 const char* name; | 491 const char* name; |
488 int id; | 492 int id; |
489 ui::ScaleFactor scale_factor; | 493 ui::ScaleFactor scale_factor; |
490 }; | 494 }; |
491 | 495 |
492 const DataResource kDataResources[] = { | 496 const DataResource kDataResources[] = { |
493 {"missingImage", IDR_BROKENIMAGE, ui::SCALE_FACTOR_100P}, | 497 {"missingImage", IDR_BROKENIMAGE, ui::SCALE_FACTOR_100P}, |
494 {"missingImage@2x", IDR_BROKENIMAGE, ui::SCALE_FACTOR_200P}, | 498 {"missingImage@2x", IDR_BROKENIMAGE, ui::SCALE_FACTOR_200P}, |
495 {"mediaplayerPause", | 499 {"mediaplayerPause", IDR_MEDIAPLAYER_PAUSE_BUTTON, ui::SCALE_FACTOR_100P}, |
496 IDR_MEDIAPLAYER_PAUSE_BUTTON, | 500 {"mediaplayerPlay", IDR_MEDIAPLAYER_PLAY_BUTTON, ui::SCALE_FACTOR_100P}, |
| 501 {"mediaplayerSoundNotMuted", IDR_MEDIAPLAYER_SOUND_NOT_MUTED_BUTTON, |
497 ui::SCALE_FACTOR_100P}, | 502 ui::SCALE_FACTOR_100P}, |
498 {"mediaplayerPlay", | 503 {"mediaplayerSoundMuted", IDR_MEDIAPLAYER_SOUND_MUTED_BUTTON, |
499 IDR_MEDIAPLAYER_PLAY_BUTTON, | |
500 ui::SCALE_FACTOR_100P}, | 504 ui::SCALE_FACTOR_100P}, |
501 {"mediaplayerSoundNotMuted", | 505 {"mediaplayerSliderThumb", IDR_MEDIAPLAYER_SLIDER_THUMB, |
502 IDR_MEDIAPLAYER_SOUND_NOT_MUTED_BUTTON, | |
503 ui::SCALE_FACTOR_100P}, | 506 ui::SCALE_FACTOR_100P}, |
504 {"mediaplayerSoundMuted", | 507 {"mediaplayerVolumeSliderThumb", IDR_MEDIAPLAYER_VOLUME_SLIDER_THUMB, |
505 IDR_MEDIAPLAYER_SOUND_MUTED_BUTTON, | |
506 ui::SCALE_FACTOR_100P}, | 508 ui::SCALE_FACTOR_100P}, |
507 {"mediaplayerSliderThumb", | 509 {"mediaplayerClosedCaption", IDR_MEDIAPLAYER_CLOSEDCAPTION_BUTTON, |
508 IDR_MEDIAPLAYER_SLIDER_THUMB, | |
509 ui::SCALE_FACTOR_100P}, | |
510 {"mediaplayerVolumeSliderThumb", | |
511 IDR_MEDIAPLAYER_VOLUME_SLIDER_THUMB, | |
512 ui::SCALE_FACTOR_100P}, | |
513 {"mediaplayerClosedCaption", | |
514 IDR_MEDIAPLAYER_CLOSEDCAPTION_BUTTON, | |
515 ui::SCALE_FACTOR_100P}, | 510 ui::SCALE_FACTOR_100P}, |
516 {"mediaplayerClosedCaptionDisabled", | 511 {"mediaplayerClosedCaptionDisabled", |
517 IDR_MEDIAPLAYER_CLOSEDCAPTION_BUTTON_DISABLED, | 512 IDR_MEDIAPLAYER_CLOSEDCAPTION_BUTTON_DISABLED, ui::SCALE_FACTOR_100P}, |
| 513 {"mediaplayerEnterFullscreen", IDR_MEDIAPLAYER_ENTER_FULLSCREEN_BUTTON, |
518 ui::SCALE_FACTOR_100P}, | 514 ui::SCALE_FACTOR_100P}, |
519 {"mediaplayerEnterFullscreen", | 515 {"mediaplayerExitFullscreen", IDR_MEDIAPLAYER_EXIT_FULLSCREEN_BUTTON, |
520 IDR_MEDIAPLAYER_ENTER_FULLSCREEN_BUTTON, | |
521 ui::SCALE_FACTOR_100P}, | 516 ui::SCALE_FACTOR_100P}, |
522 {"mediaplayerExitFullscreen", | 517 {"mediaplayerCastOff", IDR_MEDIAPLAYER_CAST_BUTTON_OFF, |
523 IDR_MEDIAPLAYER_EXIT_FULLSCREEN_BUTTON, | |
524 ui::SCALE_FACTOR_100P}, | 518 ui::SCALE_FACTOR_100P}, |
525 {"mediaplayerCastOff", | 519 {"mediaplayerCastOn", IDR_MEDIAPLAYER_CAST_BUTTON_ON, |
526 IDR_MEDIAPLAYER_CAST_BUTTON_OFF, | |
527 ui::SCALE_FACTOR_100P}, | 520 ui::SCALE_FACTOR_100P}, |
528 {"mediaplayerCastOn", | 521 {"mediaplayerOverlayCastOff", IDR_MEDIAPLAYER_OVERLAY_CAST_BUTTON_OFF, |
529 IDR_MEDIAPLAYER_CAST_BUTTON_ON, | |
530 ui::SCALE_FACTOR_100P}, | 522 ui::SCALE_FACTOR_100P}, |
531 {"mediaplayerOverlayCastOff", | 523 {"mediaplayerOverlayPlay", IDR_MEDIAPLAYER_OVERLAY_PLAY_BUTTON, |
532 IDR_MEDIAPLAYER_OVERLAY_CAST_BUTTON_OFF, | |
533 ui::SCALE_FACTOR_100P}, | 524 ui::SCALE_FACTOR_100P}, |
534 {"mediaplayerOverlayPlay", | 525 {"mediaremotingDisable", IDR_MEDIA_REMOTING_DISABLE_BUTTON, |
535 IDR_MEDIAPLAYER_OVERLAY_PLAY_BUTTON, | |
536 ui::SCALE_FACTOR_100P}, | 526 ui::SCALE_FACTOR_100P}, |
537 {"mediaplayerTrackSelectionCheckmark", | 527 {"mediaplayerTrackSelectionCheckmark", |
538 IDR_MEDIAPLAYER_TRACKSELECTION_CHECKMARK, | 528 IDR_MEDIAPLAYER_TRACKSELECTION_CHECKMARK, ui::SCALE_FACTOR_100P}, |
| 529 {"mediaplayerClosedCaptionsIcon", IDR_MEDIAPLAYER_CLOSEDCAPTIONS_ICON, |
539 ui::SCALE_FACTOR_100P}, | 530 ui::SCALE_FACTOR_100P}, |
540 {"mediaplayerClosedCaptionsIcon", | 531 {"mediaplayerSubtitlesIcon", IDR_MEDIAPLAYER_SUBTITLES_ICON, |
541 IDR_MEDIAPLAYER_CLOSEDCAPTIONS_ICON, | |
542 ui::SCALE_FACTOR_100P}, | 532 ui::SCALE_FACTOR_100P}, |
543 {"mediaplayerSubtitlesIcon", | 533 {"mediaplayerOverflowMenu", IDR_MEDIAPLAYER_OVERFLOW_MENU_ICON, |
544 IDR_MEDIAPLAYER_SUBTITLES_ICON, | |
545 ui::SCALE_FACTOR_100P}, | 534 ui::SCALE_FACTOR_100P}, |
546 {"mediaplayerOverflowMenu", | 535 {"mediaplayerDownloadIcon", IDR_MEDIAPLAYER_DOWNLOAD_ICON, |
547 IDR_MEDIAPLAYER_OVERFLOW_MENU_ICON, | |
548 ui::SCALE_FACTOR_100P}, | |
549 {"mediaplayerDownloadIcon", | |
550 IDR_MEDIAPLAYER_DOWNLOAD_ICON, | |
551 ui::SCALE_FACTOR_100P}, | 536 ui::SCALE_FACTOR_100P}, |
552 {"searchCancel", IDR_SEARCH_CANCEL, ui::SCALE_FACTOR_100P}, | 537 {"searchCancel", IDR_SEARCH_CANCEL, ui::SCALE_FACTOR_100P}, |
553 {"searchCancelPressed", IDR_SEARCH_CANCEL_PRESSED, ui::SCALE_FACTOR_100P}, | 538 {"searchCancelPressed", IDR_SEARCH_CANCEL_PRESSED, ui::SCALE_FACTOR_100P}, |
554 {"textAreaResizeCorner", IDR_TEXTAREA_RESIZER, ui::SCALE_FACTOR_100P}, | 539 {"textAreaResizeCorner", IDR_TEXTAREA_RESIZER, ui::SCALE_FACTOR_100P}, |
555 {"textAreaResizeCorner@2x", IDR_TEXTAREA_RESIZER, ui::SCALE_FACTOR_200P}, | 540 {"textAreaResizeCorner@2x", IDR_TEXTAREA_RESIZER, ui::SCALE_FACTOR_200P}, |
556 {"generatePassword", IDR_PASSWORD_GENERATION_ICON, ui::SCALE_FACTOR_100P}, | 541 {"generatePassword", IDR_PASSWORD_GENERATION_ICON, ui::SCALE_FACTOR_100P}, |
557 {"generatePasswordHover", | 542 {"generatePasswordHover", IDR_PASSWORD_GENERATION_ICON_HOVER, |
558 IDR_PASSWORD_GENERATION_ICON_HOVER, | |
559 ui::SCALE_FACTOR_100P}, | 543 ui::SCALE_FACTOR_100P}, |
560 {"html.css", IDR_UASTYLE_HTML_CSS, ui::SCALE_FACTOR_NONE}, | 544 {"html.css", IDR_UASTYLE_HTML_CSS, ui::SCALE_FACTOR_NONE}, |
561 {"quirks.css", IDR_UASTYLE_QUIRKS_CSS, ui::SCALE_FACTOR_NONE}, | 545 {"quirks.css", IDR_UASTYLE_QUIRKS_CSS, ui::SCALE_FACTOR_NONE}, |
562 {"view-source.css", IDR_UASTYLE_VIEW_SOURCE_CSS, ui::SCALE_FACTOR_NONE}, | 546 {"view-source.css", IDR_UASTYLE_VIEW_SOURCE_CSS, ui::SCALE_FACTOR_NONE}, |
563 // Not limited to Android since it's used for mobile layouts in inspector. | 547 // Not limited to Android since it's used for mobile layouts in inspector. |
564 {"themeChromiumAndroid.css", | 548 {"themeChromiumAndroid.css", IDR_UASTYLE_THEME_CHROMIUM_ANDROID_CSS, |
565 IDR_UASTYLE_THEME_CHROMIUM_ANDROID_CSS, | |
566 ui::SCALE_FACTOR_NONE}, | 549 ui::SCALE_FACTOR_NONE}, |
567 // Not limited to Android since it's used for mobile layouts in inspector. | 550 // Not limited to Android since it's used for mobile layouts in inspector. |
568 {"fullscreenAndroid.css", | 551 {"fullscreenAndroid.css", IDR_UASTYLE_FULLSCREEN_ANDROID_CSS, |
569 IDR_UASTYLE_FULLSCREEN_ANDROID_CSS, | 552 ui::SCALE_FACTOR_NONE}, |
570 ui::SCALE_FACTOR_NONE}, | |
571 // Not limited to Android since it's used for mobile layouts in inspector. | 553 // Not limited to Android since it's used for mobile layouts in inspector. |
572 {"mediaControlsAndroid.css", | 554 {"mediaControlsAndroid.css", IDR_UASTYLE_MEDIA_CONTROLS_ANDROID_CSS, |
573 IDR_UASTYLE_MEDIA_CONTROLS_ANDROID_CSS, | |
574 ui::SCALE_FACTOR_NONE}, | 555 ui::SCALE_FACTOR_NONE}, |
575 // Not limited to Linux since it's used for mobile layouts in inspector. | 556 // Not limited to Linux since it's used for mobile layouts in inspector. |
576 {"themeChromiumLinux.css", | 557 {"themeChromiumLinux.css", IDR_UASTYLE_THEME_CHROMIUM_LINUX_CSS, |
577 IDR_UASTYLE_THEME_CHROMIUM_LINUX_CSS, | |
578 ui::SCALE_FACTOR_NONE}, | 558 ui::SCALE_FACTOR_NONE}, |
579 {"themeInputMultipleFields.css", | 559 {"themeInputMultipleFields.css", |
580 IDR_UASTYLE_THEME_INPUT_MULTIPLE_FIELDS_CSS, | 560 IDR_UASTYLE_THEME_INPUT_MULTIPLE_FIELDS_CSS, ui::SCALE_FACTOR_NONE}, |
581 ui::SCALE_FACTOR_NONE}, | |
582 #if defined(OS_MACOSX) | 561 #if defined(OS_MACOSX) |
583 {"themeMac.css", IDR_UASTYLE_THEME_MAC_CSS, ui::SCALE_FACTOR_NONE}, | 562 {"themeMac.css", IDR_UASTYLE_THEME_MAC_CSS, ui::SCALE_FACTOR_NONE}, |
584 #endif | 563 #endif |
585 {"themeWin.css", IDR_UASTYLE_THEME_WIN_CSS, ui::SCALE_FACTOR_NONE}, | 564 {"themeWin.css", IDR_UASTYLE_THEME_WIN_CSS, ui::SCALE_FACTOR_NONE}, |
586 {"themeWinQuirks.css", | 565 {"themeWinQuirks.css", IDR_UASTYLE_THEME_WIN_QUIRKS_CSS, |
587 IDR_UASTYLE_THEME_WIN_QUIRKS_CSS, | |
588 ui::SCALE_FACTOR_NONE}, | 566 ui::SCALE_FACTOR_NONE}, |
589 {"svg.css", IDR_UASTYLE_SVG_CSS, ui::SCALE_FACTOR_NONE}, | 567 {"svg.css", IDR_UASTYLE_SVG_CSS, ui::SCALE_FACTOR_NONE}, |
590 {"mathml.css", IDR_UASTYLE_MATHML_CSS, ui::SCALE_FACTOR_NONE}, | 568 {"mathml.css", IDR_UASTYLE_MATHML_CSS, ui::SCALE_FACTOR_NONE}, |
591 {"mediaControls.css", | 569 {"mediaControls.css", IDR_UASTYLE_MEDIA_CONTROLS_CSS, |
592 IDR_UASTYLE_MEDIA_CONTROLS_CSS, | |
593 ui::SCALE_FACTOR_NONE}, | 570 ui::SCALE_FACTOR_NONE}, |
594 {"fullscreen.css", IDR_UASTYLE_FULLSCREEN_CSS, ui::SCALE_FACTOR_NONE}, | 571 {"fullscreen.css", IDR_UASTYLE_FULLSCREEN_CSS, ui::SCALE_FACTOR_NONE}, |
595 {"xhtmlmp.css", IDR_UASTYLE_XHTMLMP_CSS, ui::SCALE_FACTOR_NONE}, | 572 {"xhtmlmp.css", IDR_UASTYLE_XHTMLMP_CSS, ui::SCALE_FACTOR_NONE}, |
596 {"viewportAndroid.css", | 573 {"viewportAndroid.css", IDR_UASTYLE_VIEWPORT_ANDROID_CSS, |
597 IDR_UASTYLE_VIEWPORT_ANDROID_CSS, | |
598 ui::SCALE_FACTOR_NONE}, | 574 ui::SCALE_FACTOR_NONE}, |
599 {"viewportTelevision.css", | 575 {"viewportTelevision.css", IDR_UASTYLE_VIEWPORT_TELEVISION_CSS, |
600 IDR_UASTYLE_VIEWPORT_TELEVISION_CSS, | |
601 ui::SCALE_FACTOR_NONE}, | 576 ui::SCALE_FACTOR_NONE}, |
602 {"InspectorOverlayPage.html", | 577 {"InspectorOverlayPage.html", IDR_INSPECTOR_OVERLAY_PAGE_HTML, |
603 IDR_INSPECTOR_OVERLAY_PAGE_HTML, | |
604 ui::SCALE_FACTOR_NONE}, | 578 ui::SCALE_FACTOR_NONE}, |
605 {"DocumentXMLTreeViewer.css", | 579 {"DocumentXMLTreeViewer.css", IDR_DOCUMENTXMLTREEVIEWER_CSS, |
606 IDR_DOCUMENTXMLTREEVIEWER_CSS, | |
607 ui::SCALE_FACTOR_NONE}, | 580 ui::SCALE_FACTOR_NONE}, |
608 {"DocumentXMLTreeViewer.js", | 581 {"DocumentXMLTreeViewer.js", IDR_DOCUMENTXMLTREEVIEWER_JS, |
609 IDR_DOCUMENTXMLTREEVIEWER_JS, | |
610 ui::SCALE_FACTOR_NONE}, | 582 ui::SCALE_FACTOR_NONE}, |
611 #ifdef IDR_PICKER_COMMON_JS | 583 #ifdef IDR_PICKER_COMMON_JS |
612 {"pickerCommon.js", IDR_PICKER_COMMON_JS, ui::SCALE_FACTOR_NONE}, | 584 {"pickerCommon.js", IDR_PICKER_COMMON_JS, ui::SCALE_FACTOR_NONE}, |
613 {"pickerCommon.css", IDR_PICKER_COMMON_CSS, ui::SCALE_FACTOR_NONE}, | 585 {"pickerCommon.css", IDR_PICKER_COMMON_CSS, ui::SCALE_FACTOR_NONE}, |
614 {"calendarPicker.js", IDR_CALENDAR_PICKER_JS, ui::SCALE_FACTOR_NONE}, | 586 {"calendarPicker.js", IDR_CALENDAR_PICKER_JS, ui::SCALE_FACTOR_NONE}, |
615 {"calendarPicker.css", IDR_CALENDAR_PICKER_CSS, ui::SCALE_FACTOR_NONE}, | 587 {"calendarPicker.css", IDR_CALENDAR_PICKER_CSS, ui::SCALE_FACTOR_NONE}, |
616 {"listPicker.js", IDR_LIST_PICKER_JS, ui::SCALE_FACTOR_NONE}, | 588 {"listPicker.js", IDR_LIST_PICKER_JS, ui::SCALE_FACTOR_NONE}, |
617 {"listPicker.css", IDR_LIST_PICKER_CSS, ui::SCALE_FACTOR_NONE}, | 589 {"listPicker.css", IDR_LIST_PICKER_CSS, ui::SCALE_FACTOR_NONE}, |
618 {"pickerButton.css", IDR_PICKER_BUTTON_CSS, ui::SCALE_FACTOR_NONE}, | 590 {"pickerButton.css", IDR_PICKER_BUTTON_CSS, ui::SCALE_FACTOR_NONE}, |
619 {"suggestionPicker.js", IDR_SUGGESTION_PICKER_JS, ui::SCALE_FACTOR_NONE}, | 591 {"suggestionPicker.js", IDR_SUGGESTION_PICKER_JS, ui::SCALE_FACTOR_NONE}, |
620 {"suggestionPicker.css", IDR_SUGGESTION_PICKER_CSS, ui::SCALE_FACTOR_NONE}, | 592 {"suggestionPicker.css", IDR_SUGGESTION_PICKER_CSS, ui::SCALE_FACTOR_NONE}, |
621 {"colorSuggestionPicker.js", | 593 {"colorSuggestionPicker.js", IDR_COLOR_SUGGESTION_PICKER_JS, |
622 IDR_COLOR_SUGGESTION_PICKER_JS, | |
623 ui::SCALE_FACTOR_NONE}, | 594 ui::SCALE_FACTOR_NONE}, |
624 {"colorSuggestionPicker.css", | 595 {"colorSuggestionPicker.css", IDR_COLOR_SUGGESTION_PICKER_CSS, |
625 IDR_COLOR_SUGGESTION_PICKER_CSS, | |
626 ui::SCALE_FACTOR_NONE}, | 596 ui::SCALE_FACTOR_NONE}, |
627 #endif | 597 #endif |
628 }; | 598 }; |
629 | 599 |
630 } // namespace | 600 } // namespace |
631 | 601 |
632 WebData BlinkPlatformImpl::loadResource(const char* name) { | 602 WebData BlinkPlatformImpl::loadResource(const char* name) { |
633 // Some clients will call into this method with an empty |name| when they have | 603 // Some clients will call into this method with an empty |name| when they have |
634 // optional resources. For example, the PopupMenuChromium code can have icons | 604 // optional resources. For example, the PopupMenuChromium code can have icons |
635 // for some Autofill items but not for others. | 605 // for some Autofill items but not for others. |
(...skipping 237 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
873 blink::WebFeaturePolicy* BlinkPlatformImpl::duplicateFeaturePolicyWithOrigin( | 843 blink::WebFeaturePolicy* BlinkPlatformImpl::duplicateFeaturePolicyWithOrigin( |
874 const blink::WebFeaturePolicy& policy, | 844 const blink::WebFeaturePolicy& policy, |
875 const blink::WebSecurityOrigin& new_origin) { | 845 const blink::WebSecurityOrigin& new_origin) { |
876 std::unique_ptr<FeaturePolicy> new_policy = | 846 std::unique_ptr<FeaturePolicy> new_policy = |
877 FeaturePolicy::CreateFromPolicyWithOrigin( | 847 FeaturePolicy::CreateFromPolicyWithOrigin( |
878 static_cast<const FeaturePolicy&>(policy), url::Origin(new_origin)); | 848 static_cast<const FeaturePolicy&>(policy), url::Origin(new_origin)); |
879 return new_policy.release(); | 849 return new_policy.release(); |
880 } | 850 } |
881 | 851 |
882 } // namespace content | 852 } // namespace content |
OLD | NEW |