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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: content/child/blink_platform_impl.cc

Issue 1073523004: Part 7 of 8: Move blink images to their own grd/pak file. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Forgot these two. Created 5 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | content/shell/common/shell_content_client.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/child/blink_platform_impl.cc
diff --git a/content/child/blink_platform_impl.cc b/content/child/blink_platform_impl.cc
index 454a2b3486729a8b368d8ddadeafe69d5738a6f5..2c71a251fcc9e844bf7babe5fd2bbfdc86288099 100644
--- a/content/child/blink_platform_impl.cc
+++ b/content/child/blink_platform_impl.cc
@@ -739,133 +739,133 @@ struct DataResource {
};
const DataResource kDataResources[] = {
- {"missingImage", IDR2_BROKENIMAGE, ui::SCALE_FACTOR_100P},
- {"missingImage@2x", IDR2_BROKENIMAGE, ui::SCALE_FACTOR_200P},
- {"mediaplayerPause", IDR2_MEDIAPLAYER_PAUSE_BUTTON, ui::SCALE_FACTOR_100P},
+ {"missingImage", IDR_BROKENIMAGE, ui::SCALE_FACTOR_100P},
+ {"missingImage@2x", IDR_BROKENIMAGE, ui::SCALE_FACTOR_200P},
+ {"mediaplayerPause", IDR_MEDIAPLAYER_PAUSE_BUTTON, ui::SCALE_FACTOR_100P},
{"mediaplayerPauseHover",
- IDR2_MEDIAPLAYER_PAUSE_BUTTON_HOVER,
+ IDR_MEDIAPLAYER_PAUSE_BUTTON_HOVER,
ui::SCALE_FACTOR_100P},
{"mediaplayerPauseDown",
- IDR2_MEDIAPLAYER_PAUSE_BUTTON_DOWN,
+ IDR_MEDIAPLAYER_PAUSE_BUTTON_DOWN,
ui::SCALE_FACTOR_100P},
- {"mediaplayerPlay", IDR2_MEDIAPLAYER_PLAY_BUTTON, ui::SCALE_FACTOR_100P},
+ {"mediaplayerPlay", IDR_MEDIAPLAYER_PLAY_BUTTON, ui::SCALE_FACTOR_100P},
{"mediaplayerPlayHover",
- IDR2_MEDIAPLAYER_PLAY_BUTTON_HOVER,
+ IDR_MEDIAPLAYER_PLAY_BUTTON_HOVER,
ui::SCALE_FACTOR_100P},
{"mediaplayerPlayDown",
- IDR2_MEDIAPLAYER_PLAY_BUTTON_DOWN,
+ IDR_MEDIAPLAYER_PLAY_BUTTON_DOWN,
ui::SCALE_FACTOR_100P},
{"mediaplayerPlayDisabled",
- IDR2_MEDIAPLAYER_PLAY_BUTTON_DISABLED,
+ IDR_MEDIAPLAYER_PLAY_BUTTON_DISABLED,
ui::SCALE_FACTOR_100P},
{"mediaplayerSoundLevel3",
- IDR2_MEDIAPLAYER_SOUND_LEVEL3_BUTTON,
+ IDR_MEDIAPLAYER_SOUND_LEVEL3_BUTTON,
ui::SCALE_FACTOR_100P},
{"mediaplayerSoundLevel3Hover",
- IDR2_MEDIAPLAYER_SOUND_LEVEL3_BUTTON_HOVER,
+ IDR_MEDIAPLAYER_SOUND_LEVEL3_BUTTON_HOVER,
ui::SCALE_FACTOR_100P},
{"mediaplayerSoundLevel3Down",
- IDR2_MEDIAPLAYER_SOUND_LEVEL3_BUTTON_DOWN,
+ IDR_MEDIAPLAYER_SOUND_LEVEL3_BUTTON_DOWN,
ui::SCALE_FACTOR_100P},
{"mediaplayerSoundLevel2",
- IDR2_MEDIAPLAYER_SOUND_LEVEL2_BUTTON,
+ IDR_MEDIAPLAYER_SOUND_LEVEL2_BUTTON,
ui::SCALE_FACTOR_100P},
{"mediaplayerSoundLevel2Hover",
- IDR2_MEDIAPLAYER_SOUND_LEVEL2_BUTTON_HOVER,
+ IDR_MEDIAPLAYER_SOUND_LEVEL2_BUTTON_HOVER,
ui::SCALE_FACTOR_100P},
{"mediaplayerSoundLevel2Down",
- IDR2_MEDIAPLAYER_SOUND_LEVEL2_BUTTON_DOWN,
+ IDR_MEDIAPLAYER_SOUND_LEVEL2_BUTTON_DOWN,
ui::SCALE_FACTOR_100P},
{"mediaplayerSoundLevel1",
- IDR2_MEDIAPLAYER_SOUND_LEVEL1_BUTTON,
+ IDR_MEDIAPLAYER_SOUND_LEVEL1_BUTTON,
ui::SCALE_FACTOR_100P},
{"mediaplayerSoundLevel1Hover",
- IDR2_MEDIAPLAYER_SOUND_LEVEL1_BUTTON_HOVER,
+ IDR_MEDIAPLAYER_SOUND_LEVEL1_BUTTON_HOVER,
ui::SCALE_FACTOR_100P},
{"mediaplayerSoundLevel1Down",
- IDR2_MEDIAPLAYER_SOUND_LEVEL1_BUTTON_DOWN,
+ IDR_MEDIAPLAYER_SOUND_LEVEL1_BUTTON_DOWN,
ui::SCALE_FACTOR_100P},
{"mediaplayerSoundLevel0",
- IDR2_MEDIAPLAYER_SOUND_LEVEL0_BUTTON,
+ IDR_MEDIAPLAYER_SOUND_LEVEL0_BUTTON,
ui::SCALE_FACTOR_100P},
{"mediaplayerSoundLevel0Hover",
- IDR2_MEDIAPLAYER_SOUND_LEVEL0_BUTTON_HOVER,
+ IDR_MEDIAPLAYER_SOUND_LEVEL0_BUTTON_HOVER,
ui::SCALE_FACTOR_100P},
{"mediaplayerSoundLevel0Down",
- IDR2_MEDIAPLAYER_SOUND_LEVEL0_BUTTON_DOWN,
+ IDR_MEDIAPLAYER_SOUND_LEVEL0_BUTTON_DOWN,
ui::SCALE_FACTOR_100P},
{"mediaplayerSoundDisabled",
- IDR2_MEDIAPLAYER_SOUND_DISABLED,
+ IDR_MEDIAPLAYER_SOUND_DISABLED,
ui::SCALE_FACTOR_100P},
{"mediaplayerSliderThumb",
- IDR2_MEDIAPLAYER_SLIDER_THUMB,
+ IDR_MEDIAPLAYER_SLIDER_THUMB,
ui::SCALE_FACTOR_100P},
{"mediaplayerSliderThumbHover",
- IDR2_MEDIAPLAYER_SLIDER_THUMB_HOVER,
+ IDR_MEDIAPLAYER_SLIDER_THUMB_HOVER,
ui::SCALE_FACTOR_100P},
{"mediaplayerSliderThumbDown",
- IDR2_MEDIAPLAYER_SLIDER_THUMB_DOWN,
+ IDR_MEDIAPLAYER_SLIDER_THUMB_DOWN,
ui::SCALE_FACTOR_100P},
{"mediaplayerVolumeSliderThumb",
- IDR2_MEDIAPLAYER_VOLUME_SLIDER_THUMB,
+ IDR_MEDIAPLAYER_VOLUME_SLIDER_THUMB,
ui::SCALE_FACTOR_100P},
{"mediaplayerVolumeSliderThumbHover",
- IDR2_MEDIAPLAYER_VOLUME_SLIDER_THUMB_HOVER,
+ IDR_MEDIAPLAYER_VOLUME_SLIDER_THUMB_HOVER,
ui::SCALE_FACTOR_100P},
{"mediaplayerVolumeSliderThumbDown",
- IDR2_MEDIAPLAYER_VOLUME_SLIDER_THUMB_DOWN,
+ IDR_MEDIAPLAYER_VOLUME_SLIDER_THUMB_DOWN,
ui::SCALE_FACTOR_100P},
{"mediaplayerVolumeSliderThumbDisabled",
- IDR2_MEDIAPLAYER_VOLUME_SLIDER_THUMB_DISABLED,
+ IDR_MEDIAPLAYER_VOLUME_SLIDER_THUMB_DISABLED,
ui::SCALE_FACTOR_100P},
{"mediaplayerClosedCaption",
- IDR2_MEDIAPLAYER_CLOSEDCAPTION_BUTTON,
+ IDR_MEDIAPLAYER_CLOSEDCAPTION_BUTTON,
ui::SCALE_FACTOR_100P},
{"mediaplayerClosedCaptionHover",
- IDR2_MEDIAPLAYER_CLOSEDCAPTION_BUTTON_HOVER,
+ IDR_MEDIAPLAYER_CLOSEDCAPTION_BUTTON_HOVER,
ui::SCALE_FACTOR_100P},
{"mediaplayerClosedCaptionDown",
- IDR2_MEDIAPLAYER_CLOSEDCAPTION_BUTTON_DOWN,
+ IDR_MEDIAPLAYER_CLOSEDCAPTION_BUTTON_DOWN,
ui::SCALE_FACTOR_100P},
{"mediaplayerClosedCaptionDisabled",
- IDR2_MEDIAPLAYER_CLOSEDCAPTION_BUTTON_DISABLED,
+ IDR_MEDIAPLAYER_CLOSEDCAPTION_BUTTON_DISABLED,
ui::SCALE_FACTOR_100P},
{"mediaplayerFullscreen",
- IDR2_MEDIAPLAYER_FULLSCREEN_BUTTON,
+ IDR_MEDIAPLAYER_FULLSCREEN_BUTTON,
ui::SCALE_FACTOR_100P},
{"mediaplayerFullscreenHover",
- IDR2_MEDIAPLAYER_FULLSCREEN_BUTTON_HOVER,
+ IDR_MEDIAPLAYER_FULLSCREEN_BUTTON_HOVER,
ui::SCALE_FACTOR_100P},
{"mediaplayerFullscreenDown",
- IDR2_MEDIAPLAYER_FULLSCREEN_BUTTON_DOWN,
+ IDR_MEDIAPLAYER_FULLSCREEN_BUTTON_DOWN,
ui::SCALE_FACTOR_100P},
{"mediaplayerCastOff",
- IDR2_MEDIAPLAYER_CAST_BUTTON_OFF,
+ IDR_MEDIAPLAYER_CAST_BUTTON_OFF,
ui::SCALE_FACTOR_100P},
{"mediaplayerCastOn",
- IDR2_MEDIAPLAYER_CAST_BUTTON_ON,
+ IDR_MEDIAPLAYER_CAST_BUTTON_ON,
ui::SCALE_FACTOR_100P},
{"mediaplayerFullscreenDisabled",
- IDR2_MEDIAPLAYER_FULLSCREEN_BUTTON_DISABLED,
+ IDR_MEDIAPLAYER_FULLSCREEN_BUTTON_DISABLED,
ui::SCALE_FACTOR_100P},
{"mediaplayerOverlayCastOff",
- IDR2_MEDIAPLAYER_OVERLAY_CAST_BUTTON_OFF,
+ IDR_MEDIAPLAYER_OVERLAY_CAST_BUTTON_OFF,
ui::SCALE_FACTOR_100P},
{"mediaplayerOverlayPlay",
- IDR2_MEDIAPLAYER_OVERLAY_PLAY_BUTTON,
+ IDR_MEDIAPLAYER_OVERLAY_PLAY_BUTTON,
ui::SCALE_FACTOR_100P},
- {"panIcon", IDR2_PAN_SCROLL_ICON, ui::SCALE_FACTOR_100P},
- {"searchCancel", IDR2_SEARCH_CANCEL, ui::SCALE_FACTOR_100P},
- {"searchCancelPressed", IDR2_SEARCH_CANCEL_PRESSED, ui::SCALE_FACTOR_100P},
- {"searchMagnifier", IDR2_SEARCH_MAGNIFIER, ui::SCALE_FACTOR_100P},
+ {"panIcon", IDR_PAN_SCROLL_ICON, ui::SCALE_FACTOR_100P},
+ {"searchCancel", IDR_SEARCH_CANCEL, ui::SCALE_FACTOR_100P},
+ {"searchCancelPressed", IDR_SEARCH_CANCEL_PRESSED, ui::SCALE_FACTOR_100P},
+ {"searchMagnifier", IDR_SEARCH_MAGNIFIER, ui::SCALE_FACTOR_100P},
{"searchMagnifierResults",
- IDR2_SEARCH_MAGNIFIER_RESULTS,
+ IDR_SEARCH_MAGNIFIER_RESULTS,
ui::SCALE_FACTOR_100P},
- {"textAreaResizeCorner", IDR2_TEXTAREA_RESIZER, ui::SCALE_FACTOR_100P},
- {"textAreaResizeCorner@2x", IDR2_TEXTAREA_RESIZER, ui::SCALE_FACTOR_200P},
- {"generatePassword", IDR2_PASSWORD_GENERATION_ICON, ui::SCALE_FACTOR_100P},
+ {"textAreaResizeCorner", IDR_TEXTAREA_RESIZER, ui::SCALE_FACTOR_100P},
+ {"textAreaResizeCorner@2x", IDR_TEXTAREA_RESIZER, ui::SCALE_FACTOR_200P},
+ {"generatePassword", IDR_PASSWORD_GENERATION_ICON, ui::SCALE_FACTOR_100P},
{"generatePasswordHover",
- IDR2_PASSWORD_GENERATION_ICON_HOVER,
+ IDR_PASSWORD_GENERATION_ICON_HOVER,
ui::SCALE_FACTOR_100P},
{"html.css", IDR_UASTYLE_HTML_CSS, ui::SCALE_FACTOR_NONE},
{"quirks.css", IDR_UASTYLE_QUIRKS_CSS, ui::SCALE_FACTOR_NONE},
« no previous file with comments | « no previous file | content/shell/common/shell_content_client.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698