Part 7 of 8: Move blink images to their own grd/pak file.

This moves the image IDRs used on the chrome side back from IDR2_ to the
IDR_ versions. (The next and final patch will remove the IDR2_s from
webkit.)

BUG=471609, 467176

Review URL: https://codereview.chromium.org/1073523004

Cr-Commit-Position: refs/heads/master@{#324401}

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},

content/shell/common/shell_content_client.cc

@@ -65,7 +65,7 @@ base::StringPiece ShellContentClient::GetDataResource(
   if (base::CommandLine::ForCurrentProcess()->HasSwitch(
           switches::kRunLayoutTest)) {
     switch (resource_id) {
-      case IDR2_BROKENIMAGE:
+      case IDR_BROKENIMAGE:
 #if defined(OS_MACOSX)
         resource_id = IDR_CONTENT_SHELL_MISSING_IMAGE_PNG;
 #else
@@ -73,7 +73,7 @@ base::StringPiece ShellContentClient::GetDataResource(
 #endif
         break;
 
-      case IDR2_TEXTAREA_RESIZER:
+      case IDR_TEXTAREA_RESIZER:
         resource_id = IDR_CONTENT_SHELL_TEXT_AREA_RESIZE_CORNER_PNG;
         break;
     }

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},