| Index: mojo/services/html_viewer/blink_resource_constants.h
|
| diff --git a/mojo/services/html_viewer/blink_resource_constants.h b/mojo/services/html_viewer/blink_resource_constants.h
|
| index 6fc4ff16625bb149eee2a1b9fd6c08e0a82eab31..fd571ba2ca09fcd8a19b08e5e472ddd827c9d60f 100644
|
| --- a/mojo/services/html_viewer/blink_resource_constants.h
|
| +++ b/mojo/services/html_viewer/blink_resource_constants.h
|
| @@ -16,63 +16,63 @@ struct DataResource {
|
| };
|
|
|
| const DataResource kDataResources[] = {
|
| - {"missingImage", IDR2_BROKENIMAGE},
|
| + {"missingImage", IDR_BROKENIMAGE},
|
| // Skipping missingImage@2x
|
| - {"mediaplayerPause", IDR2_MEDIAPLAYER_PAUSE_BUTTON},
|
| - {"mediaplayerPauseHover", IDR2_MEDIAPLAYER_PAUSE_BUTTON_HOVER},
|
| - {"mediaplayerPauseDown", IDR2_MEDIAPLAYER_PAUSE_BUTTON_DOWN},
|
| - {"mediaplayerPlay", IDR2_MEDIAPLAYER_PLAY_BUTTON},
|
| - {"mediaplayerPlayHover", IDR2_MEDIAPLAYER_PLAY_BUTTON_HOVER},
|
| - {"mediaplayerPlayDown", IDR2_MEDIAPLAYER_PLAY_BUTTON_DOWN},
|
| - {"mediaplayerPlayDisabled", IDR2_MEDIAPLAYER_PLAY_BUTTON_DISABLED},
|
| - {"mediaplayerSoundLevel3", IDR2_MEDIAPLAYER_SOUND_LEVEL3_BUTTON},
|
| - {"mediaplayerSoundLevel3Hover", IDR2_MEDIAPLAYER_SOUND_LEVEL3_BUTTON_HOVER},
|
| - {"mediaplayerSoundLevel3Down", IDR2_MEDIAPLAYER_SOUND_LEVEL3_BUTTON_DOWN},
|
| - {"mediaplayerSoundLevel2", IDR2_MEDIAPLAYER_SOUND_LEVEL2_BUTTON},
|
| - {"mediaplayerSoundLevel2Hover", IDR2_MEDIAPLAYER_SOUND_LEVEL2_BUTTON_HOVER},
|
| - {"mediaplayerSoundLevel2Down", IDR2_MEDIAPLAYER_SOUND_LEVEL2_BUTTON_DOWN},
|
| - {"mediaplayerSoundLevel1", IDR2_MEDIAPLAYER_SOUND_LEVEL1_BUTTON},
|
| - {"mediaplayerSoundLevel1Hover", IDR2_MEDIAPLAYER_SOUND_LEVEL1_BUTTON_HOVER},
|
| - {"mediaplayerSoundLevel1Down", IDR2_MEDIAPLAYER_SOUND_LEVEL1_BUTTON_DOWN},
|
| - {"mediaplayerSoundLevel0", IDR2_MEDIAPLAYER_SOUND_LEVEL0_BUTTON},
|
| - {"mediaplayerSoundLevel0Hover", IDR2_MEDIAPLAYER_SOUND_LEVEL0_BUTTON_HOVER},
|
| - {"mediaplayerSoundLevel0Down", IDR2_MEDIAPLAYER_SOUND_LEVEL0_BUTTON_DOWN},
|
| - {"mediaplayerSoundDisabled", IDR2_MEDIAPLAYER_SOUND_DISABLED},
|
| - {"mediaplayerSliderThumb", IDR2_MEDIAPLAYER_SLIDER_THUMB},
|
| - {"mediaplayerSliderThumbHover", IDR2_MEDIAPLAYER_SLIDER_THUMB_HOVER},
|
| - {"mediaplayerSliderThumbDown", IDR2_MEDIAPLAYER_SLIDER_THUMB_DOWN},
|
| - {"mediaplayerVolumeSliderThumb", IDR2_MEDIAPLAYER_VOLUME_SLIDER_THUMB},
|
| + {"mediaplayerPause", IDR_MEDIAPLAYER_PAUSE_BUTTON},
|
| + {"mediaplayerPauseHover", IDR_MEDIAPLAYER_PAUSE_BUTTON_HOVER},
|
| + {"mediaplayerPauseDown", IDR_MEDIAPLAYER_PAUSE_BUTTON_DOWN},
|
| + {"mediaplayerPlay", IDR_MEDIAPLAYER_PLAY_BUTTON},
|
| + {"mediaplayerPlayHover", IDR_MEDIAPLAYER_PLAY_BUTTON_HOVER},
|
| + {"mediaplayerPlayDown", IDR_MEDIAPLAYER_PLAY_BUTTON_DOWN},
|
| + {"mediaplayerPlayDisabled", IDR_MEDIAPLAYER_PLAY_BUTTON_DISABLED},
|
| + {"mediaplayerSoundLevel3", IDR_MEDIAPLAYER_SOUND_LEVEL3_BUTTON},
|
| + {"mediaplayerSoundLevel3Hover", IDR_MEDIAPLAYER_SOUND_LEVEL3_BUTTON_HOVER},
|
| + {"mediaplayerSoundLevel3Down", IDR_MEDIAPLAYER_SOUND_LEVEL3_BUTTON_DOWN},
|
| + {"mediaplayerSoundLevel2", IDR_MEDIAPLAYER_SOUND_LEVEL2_BUTTON},
|
| + {"mediaplayerSoundLevel2Hover", IDR_MEDIAPLAYER_SOUND_LEVEL2_BUTTON_HOVER},
|
| + {"mediaplayerSoundLevel2Down", IDR_MEDIAPLAYER_SOUND_LEVEL2_BUTTON_DOWN},
|
| + {"mediaplayerSoundLevel1", IDR_MEDIAPLAYER_SOUND_LEVEL1_BUTTON},
|
| + {"mediaplayerSoundLevel1Hover", IDR_MEDIAPLAYER_SOUND_LEVEL1_BUTTON_HOVER},
|
| + {"mediaplayerSoundLevel1Down", IDR_MEDIAPLAYER_SOUND_LEVEL1_BUTTON_DOWN},
|
| + {"mediaplayerSoundLevel0", IDR_MEDIAPLAYER_SOUND_LEVEL0_BUTTON},
|
| + {"mediaplayerSoundLevel0Hover", IDR_MEDIAPLAYER_SOUND_LEVEL0_BUTTON_HOVER},
|
| + {"mediaplayerSoundLevel0Down", IDR_MEDIAPLAYER_SOUND_LEVEL0_BUTTON_DOWN},
|
| + {"mediaplayerSoundDisabled", IDR_MEDIAPLAYER_SOUND_DISABLED},
|
| + {"mediaplayerSliderThumb", IDR_MEDIAPLAYER_SLIDER_THUMB},
|
| + {"mediaplayerSliderThumbHover", IDR_MEDIAPLAYER_SLIDER_THUMB_HOVER},
|
| + {"mediaplayerSliderThumbDown", IDR_MEDIAPLAYER_SLIDER_THUMB_DOWN},
|
| + {"mediaplayerVolumeSliderThumb", IDR_MEDIAPLAYER_VOLUME_SLIDER_THUMB},
|
| {"mediaplayerVolumeSliderThumbHover",
|
| - IDR2_MEDIAPLAYER_VOLUME_SLIDER_THUMB_HOVER},
|
| + IDR_MEDIAPLAYER_VOLUME_SLIDER_THUMB_HOVER},
|
| {"mediaplayerVolumeSliderThumbDown",
|
| - IDR2_MEDIAPLAYER_VOLUME_SLIDER_THUMB_DOWN},
|
| + IDR_MEDIAPLAYER_VOLUME_SLIDER_THUMB_DOWN},
|
| {"mediaplayerVolumeSliderThumbDisabled",
|
| - IDR2_MEDIAPLAYER_VOLUME_SLIDER_THUMB_DISABLED},
|
| - {"mediaplayerClosedCaption", IDR2_MEDIAPLAYER_CLOSEDCAPTION_BUTTON},
|
| + IDR_MEDIAPLAYER_VOLUME_SLIDER_THUMB_DISABLED},
|
| + {"mediaplayerClosedCaption", IDR_MEDIAPLAYER_CLOSEDCAPTION_BUTTON},
|
| {"mediaplayerClosedCaptionHover",
|
| - IDR2_MEDIAPLAYER_CLOSEDCAPTION_BUTTON_HOVER},
|
| + IDR_MEDIAPLAYER_CLOSEDCAPTION_BUTTON_HOVER},
|
| {"mediaplayerClosedCaptionDown",
|
| - IDR2_MEDIAPLAYER_CLOSEDCAPTION_BUTTON_DOWN},
|
| + IDR_MEDIAPLAYER_CLOSEDCAPTION_BUTTON_DOWN},
|
| {"mediaplayerClosedCaptionDisabled",
|
| - IDR2_MEDIAPLAYER_CLOSEDCAPTION_BUTTON_DISABLED},
|
| - {"mediaplayerFullscreen", IDR2_MEDIAPLAYER_FULLSCREEN_BUTTON},
|
| - {"mediaplayerFullscreenHover", IDR2_MEDIAPLAYER_FULLSCREEN_BUTTON_HOVER},
|
| - {"mediaplayerFullscreenDown", IDR2_MEDIAPLAYER_FULLSCREEN_BUTTON_DOWN},
|
| - {"mediaplayerCastOff", IDR2_MEDIAPLAYER_CAST_BUTTON_OFF},
|
| - {"mediaplayerCastOn", IDR2_MEDIAPLAYER_CAST_BUTTON_ON},
|
| + IDR_MEDIAPLAYER_CLOSEDCAPTION_BUTTON_DISABLED},
|
| + {"mediaplayerFullscreen", IDR_MEDIAPLAYER_FULLSCREEN_BUTTON},
|
| + {"mediaplayerFullscreenHover", IDR_MEDIAPLAYER_FULLSCREEN_BUTTON_HOVER},
|
| + {"mediaplayerFullscreenDown", IDR_MEDIAPLAYER_FULLSCREEN_BUTTON_DOWN},
|
| + {"mediaplayerCastOff", IDR_MEDIAPLAYER_CAST_BUTTON_OFF},
|
| + {"mediaplayerCastOn", IDR_MEDIAPLAYER_CAST_BUTTON_ON},
|
| {"mediaplayerFullscreenDisabled",
|
| - IDR2_MEDIAPLAYER_FULLSCREEN_BUTTON_DISABLED},
|
| - {"mediaplayerOverlayCastOff", IDR2_MEDIAPLAYER_OVERLAY_CAST_BUTTON_OFF},
|
| - {"mediaplayerOverlayPlay", IDR2_MEDIAPLAYER_OVERLAY_PLAY_BUTTON},
|
| - {"panIcon", IDR2_PAN_SCROLL_ICON},
|
| - {"searchCancel", IDR2_SEARCH_CANCEL},
|
| - {"searchCancelPressed", IDR2_SEARCH_CANCEL_PRESSED},
|
| - {"searchMagnifier", IDR2_SEARCH_MAGNIFIER},
|
| - {"searchMagnifierResults", IDR2_SEARCH_MAGNIFIER_RESULTS},
|
| - {"textAreaResizeCorner", IDR2_TEXTAREA_RESIZER},
|
| + IDR_MEDIAPLAYER_FULLSCREEN_BUTTON_DISABLED},
|
| + {"mediaplayerOverlayCastOff", IDR_MEDIAPLAYER_OVERLAY_CAST_BUTTON_OFF},
|
| + {"mediaplayerOverlayPlay", IDR_MEDIAPLAYER_OVERLAY_PLAY_BUTTON},
|
| + {"panIcon", IDR_PAN_SCROLL_ICON},
|
| + {"searchCancel", IDR_SEARCH_CANCEL},
|
| + {"searchCancelPressed", IDR_SEARCH_CANCEL_PRESSED},
|
| + {"searchMagnifier", IDR_SEARCH_MAGNIFIER},
|
| + {"searchMagnifierResults", IDR_SEARCH_MAGNIFIER_RESULTS},
|
| + {"textAreaResizeCorner", IDR_TEXTAREA_RESIZER},
|
| // Skipping "textAreaResizeCorner@2x"
|
| - {"generatePassword", IDR2_PASSWORD_GENERATION_ICON},
|
| - {"generatePasswordHover", IDR2_PASSWORD_GENERATION_ICON_HOVER},
|
| + {"generatePassword", IDR_PASSWORD_GENERATION_ICON},
|
| + {"generatePasswordHover", IDR_PASSWORD_GENERATION_ICON_HOVER},
|
| {"html.css", IDR_UASTYLE_HTML_CSS},
|
| {"quirks.css", IDR_UASTYLE_QUIRKS_CSS},
|
| {"view-source.css", IDR_UASTYLE_VIEW_SOURCE_CSS},
|
|
|