summaryrefslogtreecommitdiffstats
path: root/content
diff options
context:
space:
mode:
Diffstat (limited to 'content')
-rw-r--r--content/app/resources/content_resources.grd48
-rw-r--r--content/app/resources/default_100_percent/broken_image.pngbin448 -> 0 bytes
-rw-r--r--content/app/resources/default_100_percent/mediaplayer_cast_off.pngbin37155 -> 0 bytes
-rw-r--r--content/app/resources/default_100_percent/mediaplayer_cast_on.pngbin37155 -> 0 bytes
-rw-r--r--content/app/resources/default_100_percent/mediaplayer_closedcaption.pngbin2499 -> 0 bytes
-rw-r--r--content/app/resources/default_100_percent/mediaplayer_closedcaption_disabled.pngbin2764 -> 0 bytes
-rw-r--r--content/app/resources/default_100_percent/mediaplayer_closedcaption_down.pngbin8520 -> 0 bytes
-rw-r--r--content/app/resources/default_100_percent/mediaplayer_closedcaption_hover.pngbin7995 -> 0 bytes
-rw-r--r--content/app/resources/default_100_percent/mediaplayer_fullscreen.pngbin1116 -> 0 bytes
-rw-r--r--content/app/resources/default_100_percent/mediaplayer_fullscreen_disabled.pngbin780 -> 0 bytes
-rw-r--r--content/app/resources/default_100_percent/mediaplayer_fullscreen_down.pngbin4844 -> 0 bytes
-rw-r--r--content/app/resources/default_100_percent/mediaplayer_fullscreen_hover.pngbin4649 -> 0 bytes
-rw-r--r--content/app/resources/default_100_percent/mediaplayer_overlay_cast_off.pngbin1293 -> 0 bytes
-rw-r--r--content/app/resources/default_100_percent/mediaplayer_overlay_play.pngbin1243 -> 0 bytes
-rw-r--r--content/app/resources/default_100_percent/mediaplayer_pause.pngbin814 -> 0 bytes
-rw-r--r--content/app/resources/default_100_percent/mediaplayer_pause_down.pngbin4687 -> 0 bytes
-rw-r--r--content/app/resources/default_100_percent/mediaplayer_pause_hover.pngbin4507 -> 0 bytes
-rw-r--r--content/app/resources/default_100_percent/mediaplayer_play.pngbin1243 -> 0 bytes
-rw-r--r--content/app/resources/default_100_percent/mediaplayer_play_disabled.pngbin1007 -> 0 bytes
-rw-r--r--content/app/resources/default_100_percent/mediaplayer_play_down.pngbin5591 -> 0 bytes
-rw-r--r--content/app/resources/default_100_percent/mediaplayer_play_hover.pngbin5434 -> 0 bytes
-rw-r--r--content/app/resources/default_100_percent/mediaplayer_slider_thumb.pngbin4035 -> 0 bytes
-rw-r--r--content/app/resources/default_100_percent/mediaplayer_slider_thumb_down.pngbin5450 -> 0 bytes
-rw-r--r--content/app/resources/default_100_percent/mediaplayer_slider_thumb_hover.pngbin5294 -> 0 bytes
-rw-r--r--content/app/resources/default_100_percent/mediaplayer_sound_disabled.pngbin1283 -> 0 bytes
-rw-r--r--content/app/resources/default_100_percent/mediaplayer_sound_level0.pngbin1051 -> 0 bytes
-rw-r--r--content/app/resources/default_100_percent/mediaplayer_sound_level0_down.pngbin10516 -> 0 bytes
-rw-r--r--content/app/resources/default_100_percent/mediaplayer_sound_level0_hover.pngbin10396 -> 0 bytes
-rw-r--r--content/app/resources/default_100_percent/mediaplayer_sound_level1.pngbin962 -> 0 bytes
-rw-r--r--content/app/resources/default_100_percent/mediaplayer_sound_level1_down.pngbin5440 -> 0 bytes
-rw-r--r--content/app/resources/default_100_percent/mediaplayer_sound_level1_hover.pngbin5257 -> 0 bytes
-rw-r--r--content/app/resources/default_100_percent/mediaplayer_sound_level2.pngbin1263 -> 0 bytes
-rw-r--r--content/app/resources/default_100_percent/mediaplayer_sound_level2_down.pngbin10327 -> 0 bytes
-rw-r--r--content/app/resources/default_100_percent/mediaplayer_sound_level2_hover.pngbin10113 -> 0 bytes
-rw-r--r--content/app/resources/default_100_percent/mediaplayer_sound_level3.pngbin1669 -> 0 bytes
-rw-r--r--content/app/resources/default_100_percent/mediaplayer_sound_level3_down.pngbin12290 -> 0 bytes
-rw-r--r--content/app/resources/default_100_percent/mediaplayer_sound_level3_hover.pngbin12122 -> 0 bytes
-rw-r--r--content/app/resources/default_100_percent/mediaplayer_volume_slider_thumb.pngbin3749 -> 0 bytes
-rw-r--r--content/app/resources/default_100_percent/mediaplayer_volume_slider_thumb_disabled.pngbin2516 -> 0 bytes
-rw-r--r--content/app/resources/default_100_percent/mediaplayer_volume_slider_thumb_down.pngbin4941 -> 0 bytes
-rw-r--r--content/app/resources/default_100_percent/mediaplayer_volume_slider_thumb_hover.pngbin4773 -> 0 bytes
-rw-r--r--content/app/resources/default_100_percent/pan_icon.pngbin136 -> 0 bytes
-rw-r--r--content/app/resources/default_100_percent/password_generation.pngbin407 -> 0 bytes
-rw-r--r--content/app/resources/default_100_percent/password_generation_hover.pngbin408 -> 0 bytes
-rw-r--r--content/app/resources/default_100_percent/search_cancel.pngbin744 -> 0 bytes
-rw-r--r--content/app/resources/default_100_percent/search_cancel_pressed.pngbin761 -> 0 bytes
-rw-r--r--content/app/resources/default_100_percent/search_magnifier.pngbin872 -> 0 bytes
-rw-r--r--content/app/resources/default_100_percent/search_magnifier_results.pngbin1040 -> 0 bytes
-rw-r--r--content/app/resources/default_100_percent/textarea_resize_corner.pngbin92 -> 0 bytes
-rw-r--r--content/app/resources/default_200_percent/broken_image.pngbin810 -> 0 bytes
-rw-r--r--content/app/resources/default_200_percent/pan_icon.pngbin141 -> 0 bytes
-rw-r--r--content/app/resources/default_200_percent/textarea_resize_corner.pngbin147 -> 0 bytes
-rw-r--r--content/child/blink_platform_impl.cc100
-rw-r--r--content/content_shell.gypi2
-rw-r--r--content/shell/BUILD.gn2
-rw-r--r--content/shell/common/shell_content_client.cc5
56 files changed, 55 insertions, 102 deletions
diff --git a/content/app/resources/content_resources.grd b/content/app/resources/content_resources.grd
index 9e90cd5..75913e3 100644
--- a/content/app/resources/content_resources.grd
+++ b/content/app/resources/content_resources.grd
@@ -9,46 +9,6 @@
</outputs>
<release seq="1">
<structures fallback_to_low_resolution="true">
- <structure type="chrome_scaled_image" name="IDR2_BROKENIMAGE" file="broken_image.png" />
- <structure type="chrome_scaled_image" name="IDR2_MEDIAPLAYER_PAUSE_BUTTON" file="mediaplayer_pause.png" />
- <structure type="chrome_scaled_image" name="IDR2_MEDIAPLAYER_PAUSE_BUTTON_HOVER" file="mediaplayer_pause_hover.png" />
- <structure type="chrome_scaled_image" name="IDR2_MEDIAPLAYER_PAUSE_BUTTON_DOWN" file="mediaplayer_pause_down.png" />
- <structure type="chrome_scaled_image" name="IDR2_MEDIAPLAYER_PLAY_BUTTON" file="mediaplayer_play.png" />
- <structure type="chrome_scaled_image" name="IDR2_MEDIAPLAYER_PLAY_BUTTON_HOVER" file="mediaplayer_play_hover.png" />
- <structure type="chrome_scaled_image" name="IDR2_MEDIAPLAYER_PLAY_BUTTON_DOWN" file="mediaplayer_play_down.png" />
- <structure type="chrome_scaled_image" name="IDR2_MEDIAPLAYER_PLAY_BUTTON_DISABLED" file="mediaplayer_play_disabled.png" />
- <structure type="chrome_scaled_image" name="IDR2_MEDIAPLAYER_SOUND_LEVEL3_BUTTON" file="mediaplayer_sound_level3.png" />
- <structure type="chrome_scaled_image" name="IDR2_MEDIAPLAYER_SOUND_LEVEL3_BUTTON_HOVER" file="mediaplayer_sound_level3_hover.png" />
- <structure type="chrome_scaled_image" name="IDR2_MEDIAPLAYER_SOUND_LEVEL3_BUTTON_DOWN" file="mediaplayer_sound_level3_down.png" />
- <structure type="chrome_scaled_image" name="IDR2_MEDIAPLAYER_SOUND_LEVEL2_BUTTON" file="mediaplayer_sound_level2.png" />
- <structure type="chrome_scaled_image" name="IDR2_MEDIAPLAYER_SOUND_LEVEL2_BUTTON_HOVER" file="mediaplayer_sound_level2_hover.png" />
- <structure type="chrome_scaled_image" name="IDR2_MEDIAPLAYER_SOUND_LEVEL2_BUTTON_DOWN" file="mediaplayer_sound_level2_down.png" />
- <structure type="chrome_scaled_image" name="IDR2_MEDIAPLAYER_SOUND_LEVEL1_BUTTON" file="mediaplayer_sound_level1.png" />
- <structure type="chrome_scaled_image" name="IDR2_MEDIAPLAYER_SOUND_LEVEL1_BUTTON_HOVER" file="mediaplayer_sound_level1_hover.png" />
- <structure type="chrome_scaled_image" name="IDR2_MEDIAPLAYER_SOUND_LEVEL1_BUTTON_DOWN" file="mediaplayer_sound_level1_down.png" />
- <structure type="chrome_scaled_image" name="IDR2_MEDIAPLAYER_SOUND_LEVEL0_BUTTON" file="mediaplayer_sound_level0.png" />
- <structure type="chrome_scaled_image" name="IDR2_MEDIAPLAYER_SOUND_LEVEL0_BUTTON_HOVER" file="mediaplayer_sound_level0_hover.png" />
- <structure type="chrome_scaled_image" name="IDR2_MEDIAPLAYER_SOUND_LEVEL0_BUTTON_DOWN" file="mediaplayer_sound_level0_down.png" />
- <structure type="chrome_scaled_image" name="IDR2_MEDIAPLAYER_SOUND_DISABLED" file="mediaplayer_sound_disabled.png" />
- <structure type="chrome_scaled_image" name="IDR2_MEDIAPLAYER_SLIDER_THUMB" file="mediaplayer_slider_thumb.png" />
- <structure type="chrome_scaled_image" name="IDR2_MEDIAPLAYER_SLIDER_THUMB_HOVER" file="mediaplayer_slider_thumb_hover.png" />
- <structure type="chrome_scaled_image" name="IDR2_MEDIAPLAYER_SLIDER_THUMB_DOWN" file="mediaplayer_slider_thumb_down.png" />
- <structure type="chrome_scaled_image" name="IDR2_MEDIAPLAYER_VOLUME_SLIDER_THUMB" file="mediaplayer_volume_slider_thumb.png" />
- <structure type="chrome_scaled_image" name="IDR2_MEDIAPLAYER_VOLUME_SLIDER_THUMB_HOVER" file="mediaplayer_volume_slider_thumb_hover.png" />
- <structure type="chrome_scaled_image" name="IDR2_MEDIAPLAYER_VOLUME_SLIDER_THUMB_DOWN" file="mediaplayer_volume_slider_thumb_down.png" />
- <structure type="chrome_scaled_image" name="IDR2_MEDIAPLAYER_VOLUME_SLIDER_THUMB_DISABLED" file="mediaplayer_volume_slider_thumb_disabled.png" />
- <structure type="chrome_scaled_image" name="IDR2_MEDIAPLAYER_CLOSEDCAPTION_BUTTON" file="mediaplayer_closedcaption.png" />
- <structure type="chrome_scaled_image" name="IDR2_MEDIAPLAYER_CLOSEDCAPTION_BUTTON_HOVER" file="mediaplayer_closedcaption_hover.png" />
- <structure type="chrome_scaled_image" name="IDR2_MEDIAPLAYER_CLOSEDCAPTION_BUTTON_DOWN" file="mediaplayer_closedcaption_down.png" />
- <structure type="chrome_scaled_image" name="IDR2_MEDIAPLAYER_CLOSEDCAPTION_BUTTON_DISABLED" file="mediaplayer_closedcaption_disabled.png" />
- <structure type="chrome_scaled_image" name="IDR2_MEDIAPLAYER_FULLSCREEN_BUTTON" file="mediaplayer_fullscreen.png" />
- <structure type="chrome_scaled_image" name="IDR2_MEDIAPLAYER_FULLSCREEN_BUTTON_HOVER" file="mediaplayer_fullscreen_hover.png" />
- <structure type="chrome_scaled_image" name="IDR2_MEDIAPLAYER_FULLSCREEN_BUTTON_DOWN" file="mediaplayer_fullscreen_down.png" />
- <structure type="chrome_scaled_image" name="IDR2_MEDIAPLAYER_FULLSCREEN_BUTTON_DISABLED" file="mediaplayer_fullscreen_disabled.png" />
- <structure type="chrome_scaled_image" name="IDR2_MEDIAPLAYER_CAST_BUTTON_OFF" file="mediaplayer_cast_off.png" />
- <structure type="chrome_scaled_image" name="IDR2_MEDIAPLAYER_CAST_BUTTON_ON" file="mediaplayer_cast_on.png" />
- <structure type="chrome_scaled_image" name="IDR2_MEDIAPLAYER_OVERLAY_CAST_BUTTON_OFF" file="mediaplayer_overlay_cast_off.png" />
- <structure type="chrome_scaled_image" name="IDR2_MEDIAPLAYER_OVERLAY_PLAY_BUTTON" file="mediaplayer_overlay_play.png" />
<if expr="is_macosx">
<structure type="chrome_scaled_image" name="IDR_ALIAS_CURSOR" file="alias_cursor.png" />
<structure type="chrome_scaled_image" name="IDR_CELL_CURSOR" file="cell_cursor.png" />
@@ -74,14 +34,6 @@
<structure type="chrome_scaled_image" name="IDR_ZOOMIN_CURSOR" file="zoom_in_cursor.png" />
<structure type="chrome_scaled_image" name="IDR_ZOOMOUT_CURSOR" file="zoom_out_cursor.png" />
</if>
- <structure type="chrome_scaled_image" name="IDR2_PAN_SCROLL_ICON" file="pan_icon.png" />
- <structure type="chrome_scaled_image" name="IDR2_SEARCH_CANCEL" file="search_cancel.png" />
- <structure type="chrome_scaled_image" name="IDR2_SEARCH_CANCEL_PRESSED" file="search_cancel_pressed.png" />
- <structure type="chrome_scaled_image" name="IDR2_SEARCH_MAGNIFIER" file="search_magnifier.png" />
- <structure type="chrome_scaled_image" name="IDR2_SEARCH_MAGNIFIER_RESULTS" file="search_magnifier_results.png" />
- <structure type="chrome_scaled_image" name="IDR2_TEXTAREA_RESIZER" file="textarea_resize_corner.png" />
- <structure type="chrome_scaled_image" name="IDR2_PASSWORD_GENERATION_ICON" file="password_generation.png" />
- <structure type="chrome_scaled_image" name="IDR2_PASSWORD_GENERATION_ICON_HOVER" file="password_generation_hover.png" />
</structures>
</release>
</grit>
diff --git a/content/app/resources/default_100_percent/broken_image.png b/content/app/resources/default_100_percent/broken_image.png
deleted file mode 100644
index ad76cc1..0000000
--- a/content/app/resources/default_100_percent/broken_image.png
+++ /dev/null
Binary files differ
diff --git a/content/app/resources/default_100_percent/mediaplayer_cast_off.png b/content/app/resources/default_100_percent/mediaplayer_cast_off.png
deleted file mode 100644
index 050022d..0000000
--- a/content/app/resources/default_100_percent/mediaplayer_cast_off.png
+++ /dev/null
Binary files differ
diff --git a/content/app/resources/default_100_percent/mediaplayer_cast_on.png b/content/app/resources/default_100_percent/mediaplayer_cast_on.png
deleted file mode 100644
index 4f24bf9..0000000
--- a/content/app/resources/default_100_percent/mediaplayer_cast_on.png
+++ /dev/null
Binary files differ
diff --git a/content/app/resources/default_100_percent/mediaplayer_closedcaption.png b/content/app/resources/default_100_percent/mediaplayer_closedcaption.png
deleted file mode 100644
index a92b3d2..0000000
--- a/content/app/resources/default_100_percent/mediaplayer_closedcaption.png
+++ /dev/null
Binary files differ
diff --git a/content/app/resources/default_100_percent/mediaplayer_closedcaption_disabled.png b/content/app/resources/default_100_percent/mediaplayer_closedcaption_disabled.png
deleted file mode 100644
index 7ac1a89..0000000
--- a/content/app/resources/default_100_percent/mediaplayer_closedcaption_disabled.png
+++ /dev/null
Binary files differ
diff --git a/content/app/resources/default_100_percent/mediaplayer_closedcaption_down.png b/content/app/resources/default_100_percent/mediaplayer_closedcaption_down.png
deleted file mode 100644
index 60da8a2..0000000
--- a/content/app/resources/default_100_percent/mediaplayer_closedcaption_down.png
+++ /dev/null
Binary files differ
diff --git a/content/app/resources/default_100_percent/mediaplayer_closedcaption_hover.png b/content/app/resources/default_100_percent/mediaplayer_closedcaption_hover.png
deleted file mode 100644
index a3e069f..0000000
--- a/content/app/resources/default_100_percent/mediaplayer_closedcaption_hover.png
+++ /dev/null
Binary files differ
diff --git a/content/app/resources/default_100_percent/mediaplayer_fullscreen.png b/content/app/resources/default_100_percent/mediaplayer_fullscreen.png
deleted file mode 100644
index 713a877..0000000
--- a/content/app/resources/default_100_percent/mediaplayer_fullscreen.png
+++ /dev/null
Binary files differ
diff --git a/content/app/resources/default_100_percent/mediaplayer_fullscreen_disabled.png b/content/app/resources/default_100_percent/mediaplayer_fullscreen_disabled.png
deleted file mode 100644
index f0958a6..0000000
--- a/content/app/resources/default_100_percent/mediaplayer_fullscreen_disabled.png
+++ /dev/null
Binary files differ
diff --git a/content/app/resources/default_100_percent/mediaplayer_fullscreen_down.png b/content/app/resources/default_100_percent/mediaplayer_fullscreen_down.png
deleted file mode 100644
index 3a6cd5d..0000000
--- a/content/app/resources/default_100_percent/mediaplayer_fullscreen_down.png
+++ /dev/null
Binary files differ
diff --git a/content/app/resources/default_100_percent/mediaplayer_fullscreen_hover.png b/content/app/resources/default_100_percent/mediaplayer_fullscreen_hover.png
deleted file mode 100644
index 38e3330..0000000
--- a/content/app/resources/default_100_percent/mediaplayer_fullscreen_hover.png
+++ /dev/null
Binary files differ
diff --git a/content/app/resources/default_100_percent/mediaplayer_overlay_cast_off.png b/content/app/resources/default_100_percent/mediaplayer_overlay_cast_off.png
deleted file mode 100644
index e16f58e..0000000
--- a/content/app/resources/default_100_percent/mediaplayer_overlay_cast_off.png
+++ /dev/null
Binary files differ
diff --git a/content/app/resources/default_100_percent/mediaplayer_overlay_play.png b/content/app/resources/default_100_percent/mediaplayer_overlay_play.png
deleted file mode 100644
index cfd48d7..0000000
--- a/content/app/resources/default_100_percent/mediaplayer_overlay_play.png
+++ /dev/null
Binary files differ
diff --git a/content/app/resources/default_100_percent/mediaplayer_pause.png b/content/app/resources/default_100_percent/mediaplayer_pause.png
deleted file mode 100644
index b488e97..0000000
--- a/content/app/resources/default_100_percent/mediaplayer_pause.png
+++ /dev/null
Binary files differ
diff --git a/content/app/resources/default_100_percent/mediaplayer_pause_down.png b/content/app/resources/default_100_percent/mediaplayer_pause_down.png
deleted file mode 100644
index bf754e9..0000000
--- a/content/app/resources/default_100_percent/mediaplayer_pause_down.png
+++ /dev/null
Binary files differ
diff --git a/content/app/resources/default_100_percent/mediaplayer_pause_hover.png b/content/app/resources/default_100_percent/mediaplayer_pause_hover.png
deleted file mode 100644
index ac3334c..0000000
--- a/content/app/resources/default_100_percent/mediaplayer_pause_hover.png
+++ /dev/null
Binary files differ
diff --git a/content/app/resources/default_100_percent/mediaplayer_play.png b/content/app/resources/default_100_percent/mediaplayer_play.png
deleted file mode 100644
index 1e53d43..0000000
--- a/content/app/resources/default_100_percent/mediaplayer_play.png
+++ /dev/null
Binary files differ
diff --git a/content/app/resources/default_100_percent/mediaplayer_play_disabled.png b/content/app/resources/default_100_percent/mediaplayer_play_disabled.png
deleted file mode 100644
index 8e12200..0000000
--- a/content/app/resources/default_100_percent/mediaplayer_play_disabled.png
+++ /dev/null
Binary files differ
diff --git a/content/app/resources/default_100_percent/mediaplayer_play_down.png b/content/app/resources/default_100_percent/mediaplayer_play_down.png
deleted file mode 100644
index fa6a243..0000000
--- a/content/app/resources/default_100_percent/mediaplayer_play_down.png
+++ /dev/null
Binary files differ
diff --git a/content/app/resources/default_100_percent/mediaplayer_play_hover.png b/content/app/resources/default_100_percent/mediaplayer_play_hover.png
deleted file mode 100644
index a71c2f3..0000000
--- a/content/app/resources/default_100_percent/mediaplayer_play_hover.png
+++ /dev/null
Binary files differ
diff --git a/content/app/resources/default_100_percent/mediaplayer_slider_thumb.png b/content/app/resources/default_100_percent/mediaplayer_slider_thumb.png
deleted file mode 100644
index 4cc24d1..0000000
--- a/content/app/resources/default_100_percent/mediaplayer_slider_thumb.png
+++ /dev/null
Binary files differ
diff --git a/content/app/resources/default_100_percent/mediaplayer_slider_thumb_down.png b/content/app/resources/default_100_percent/mediaplayer_slider_thumb_down.png
deleted file mode 100644
index 483101d..0000000
--- a/content/app/resources/default_100_percent/mediaplayer_slider_thumb_down.png
+++ /dev/null
Binary files differ
diff --git a/content/app/resources/default_100_percent/mediaplayer_slider_thumb_hover.png b/content/app/resources/default_100_percent/mediaplayer_slider_thumb_hover.png
deleted file mode 100644
index 2a96842..0000000
--- a/content/app/resources/default_100_percent/mediaplayer_slider_thumb_hover.png
+++ /dev/null
Binary files differ
diff --git a/content/app/resources/default_100_percent/mediaplayer_sound_disabled.png b/content/app/resources/default_100_percent/mediaplayer_sound_disabled.png
deleted file mode 100644
index 38fa4ba..0000000
--- a/content/app/resources/default_100_percent/mediaplayer_sound_disabled.png
+++ /dev/null
Binary files differ
diff --git a/content/app/resources/default_100_percent/mediaplayer_sound_level0.png b/content/app/resources/default_100_percent/mediaplayer_sound_level0.png
deleted file mode 100644
index 22d6a10..0000000
--- a/content/app/resources/default_100_percent/mediaplayer_sound_level0.png
+++ /dev/null
Binary files differ
diff --git a/content/app/resources/default_100_percent/mediaplayer_sound_level0_down.png b/content/app/resources/default_100_percent/mediaplayer_sound_level0_down.png
deleted file mode 100644
index d956e58..0000000
--- a/content/app/resources/default_100_percent/mediaplayer_sound_level0_down.png
+++ /dev/null
Binary files differ
diff --git a/content/app/resources/default_100_percent/mediaplayer_sound_level0_hover.png b/content/app/resources/default_100_percent/mediaplayer_sound_level0_hover.png
deleted file mode 100644
index 56214a1..0000000
--- a/content/app/resources/default_100_percent/mediaplayer_sound_level0_hover.png
+++ /dev/null
Binary files differ
diff --git a/content/app/resources/default_100_percent/mediaplayer_sound_level1.png b/content/app/resources/default_100_percent/mediaplayer_sound_level1.png
deleted file mode 100644
index 2c6809a..0000000
--- a/content/app/resources/default_100_percent/mediaplayer_sound_level1.png
+++ /dev/null
Binary files differ
diff --git a/content/app/resources/default_100_percent/mediaplayer_sound_level1_down.png b/content/app/resources/default_100_percent/mediaplayer_sound_level1_down.png
deleted file mode 100644
index faa1888..0000000
--- a/content/app/resources/default_100_percent/mediaplayer_sound_level1_down.png
+++ /dev/null
Binary files differ
diff --git a/content/app/resources/default_100_percent/mediaplayer_sound_level1_hover.png b/content/app/resources/default_100_percent/mediaplayer_sound_level1_hover.png
deleted file mode 100644
index 1fdaf21..0000000
--- a/content/app/resources/default_100_percent/mediaplayer_sound_level1_hover.png
+++ /dev/null
Binary files differ
diff --git a/content/app/resources/default_100_percent/mediaplayer_sound_level2.png b/content/app/resources/default_100_percent/mediaplayer_sound_level2.png
deleted file mode 100644
index e98c51d..0000000
--- a/content/app/resources/default_100_percent/mediaplayer_sound_level2.png
+++ /dev/null
Binary files differ
diff --git a/content/app/resources/default_100_percent/mediaplayer_sound_level2_down.png b/content/app/resources/default_100_percent/mediaplayer_sound_level2_down.png
deleted file mode 100644
index 37f5d76..0000000
--- a/content/app/resources/default_100_percent/mediaplayer_sound_level2_down.png
+++ /dev/null
Binary files differ
diff --git a/content/app/resources/default_100_percent/mediaplayer_sound_level2_hover.png b/content/app/resources/default_100_percent/mediaplayer_sound_level2_hover.png
deleted file mode 100644
index e44356b..0000000
--- a/content/app/resources/default_100_percent/mediaplayer_sound_level2_hover.png
+++ /dev/null
Binary files differ
diff --git a/content/app/resources/default_100_percent/mediaplayer_sound_level3.png b/content/app/resources/default_100_percent/mediaplayer_sound_level3.png
deleted file mode 100644
index 05caa64..0000000
--- a/content/app/resources/default_100_percent/mediaplayer_sound_level3.png
+++ /dev/null
Binary files differ
diff --git a/content/app/resources/default_100_percent/mediaplayer_sound_level3_down.png b/content/app/resources/default_100_percent/mediaplayer_sound_level3_down.png
deleted file mode 100644
index db38404..0000000
--- a/content/app/resources/default_100_percent/mediaplayer_sound_level3_down.png
+++ /dev/null
Binary files differ
diff --git a/content/app/resources/default_100_percent/mediaplayer_sound_level3_hover.png b/content/app/resources/default_100_percent/mediaplayer_sound_level3_hover.png
deleted file mode 100644
index 838b07f..0000000
--- a/content/app/resources/default_100_percent/mediaplayer_sound_level3_hover.png
+++ /dev/null
Binary files differ
diff --git a/content/app/resources/default_100_percent/mediaplayer_volume_slider_thumb.png b/content/app/resources/default_100_percent/mediaplayer_volume_slider_thumb.png
deleted file mode 100644
index c4620f5..0000000
--- a/content/app/resources/default_100_percent/mediaplayer_volume_slider_thumb.png
+++ /dev/null
Binary files differ
diff --git a/content/app/resources/default_100_percent/mediaplayer_volume_slider_thumb_disabled.png b/content/app/resources/default_100_percent/mediaplayer_volume_slider_thumb_disabled.png
deleted file mode 100644
index d32434b..0000000
--- a/content/app/resources/default_100_percent/mediaplayer_volume_slider_thumb_disabled.png
+++ /dev/null
Binary files differ
diff --git a/content/app/resources/default_100_percent/mediaplayer_volume_slider_thumb_down.png b/content/app/resources/default_100_percent/mediaplayer_volume_slider_thumb_down.png
deleted file mode 100644
index 98ee850..0000000
--- a/content/app/resources/default_100_percent/mediaplayer_volume_slider_thumb_down.png
+++ /dev/null
Binary files differ
diff --git a/content/app/resources/default_100_percent/mediaplayer_volume_slider_thumb_hover.png b/content/app/resources/default_100_percent/mediaplayer_volume_slider_thumb_hover.png
deleted file mode 100644
index 93cca9b..0000000
--- a/content/app/resources/default_100_percent/mediaplayer_volume_slider_thumb_hover.png
+++ /dev/null
Binary files differ
diff --git a/content/app/resources/default_100_percent/pan_icon.png b/content/app/resources/default_100_percent/pan_icon.png
deleted file mode 100644
index e07d962..0000000
--- a/content/app/resources/default_100_percent/pan_icon.png
+++ /dev/null
Binary files differ
diff --git a/content/app/resources/default_100_percent/password_generation.png b/content/app/resources/default_100_percent/password_generation.png
deleted file mode 100644
index 2b45ac3..0000000
--- a/content/app/resources/default_100_percent/password_generation.png
+++ /dev/null
Binary files differ
diff --git a/content/app/resources/default_100_percent/password_generation_hover.png b/content/app/resources/default_100_percent/password_generation_hover.png
deleted file mode 100644
index a832cdc..0000000
--- a/content/app/resources/default_100_percent/password_generation_hover.png
+++ /dev/null
Binary files differ
diff --git a/content/app/resources/default_100_percent/search_cancel.png b/content/app/resources/default_100_percent/search_cancel.png
deleted file mode 100644
index 1291bf8..0000000
--- a/content/app/resources/default_100_percent/search_cancel.png
+++ /dev/null
Binary files differ
diff --git a/content/app/resources/default_100_percent/search_cancel_pressed.png b/content/app/resources/default_100_percent/search_cancel_pressed.png
deleted file mode 100644
index 4abc0fd..0000000
--- a/content/app/resources/default_100_percent/search_cancel_pressed.png
+++ /dev/null
Binary files differ
diff --git a/content/app/resources/default_100_percent/search_magnifier.png b/content/app/resources/default_100_percent/search_magnifier.png
deleted file mode 100644
index 0aea5da..0000000
--- a/content/app/resources/default_100_percent/search_magnifier.png
+++ /dev/null
Binary files differ
diff --git a/content/app/resources/default_100_percent/search_magnifier_results.png b/content/app/resources/default_100_percent/search_magnifier_results.png
deleted file mode 100644
index 2f773c06..0000000
--- a/content/app/resources/default_100_percent/search_magnifier_results.png
+++ /dev/null
Binary files differ
diff --git a/content/app/resources/default_100_percent/textarea_resize_corner.png b/content/app/resources/default_100_percent/textarea_resize_corner.png
deleted file mode 100644
index a379bdd..0000000
--- a/content/app/resources/default_100_percent/textarea_resize_corner.png
+++ /dev/null
Binary files differ
diff --git a/content/app/resources/default_200_percent/broken_image.png b/content/app/resources/default_200_percent/broken_image.png
deleted file mode 100644
index 45edebc..0000000
--- a/content/app/resources/default_200_percent/broken_image.png
+++ /dev/null
Binary files differ
diff --git a/content/app/resources/default_200_percent/pan_icon.png b/content/app/resources/default_200_percent/pan_icon.png
deleted file mode 100644
index d9c0c15..0000000
--- a/content/app/resources/default_200_percent/pan_icon.png
+++ /dev/null
Binary files differ
diff --git a/content/app/resources/default_200_percent/textarea_resize_corner.png b/content/app/resources/default_200_percent/textarea_resize_corner.png
deleted file mode 100644
index 77fa3ca..0000000
--- a/content/app/resources/default_200_percent/textarea_resize_corner.png
+++ /dev/null
Binary files differ
diff --git a/content/child/blink_platform_impl.cc b/content/child/blink_platform_impl.cc
index 92bef2e..db0ba13 100644
--- a/content/child/blink_platform_impl.cc
+++ b/content/child/blink_platform_impl.cc
@@ -738,95 +738,95 @@ 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, ui::SCALE_FACTOR_100P },
+ IDR_MEDIAPLAYER_PAUSE_BUTTON_HOVER, ui::SCALE_FACTOR_100P },
{ "mediaplayerPauseDown",
- IDR2_MEDIAPLAYER_PAUSE_BUTTON_DOWN, ui::SCALE_FACTOR_100P },
- { "mediaplayerPlay", IDR2_MEDIAPLAYER_PLAY_BUTTON, ui::SCALE_FACTOR_100P },
+ IDR_MEDIAPLAYER_PAUSE_BUTTON_DOWN, ui::SCALE_FACTOR_100P },
+ { "mediaplayerPlay", IDR_MEDIAPLAYER_PLAY_BUTTON, ui::SCALE_FACTOR_100P },
{ "mediaplayerPlayHover",
- IDR2_MEDIAPLAYER_PLAY_BUTTON_HOVER, ui::SCALE_FACTOR_100P },
+ IDR_MEDIAPLAYER_PLAY_BUTTON_HOVER, ui::SCALE_FACTOR_100P },
{ "mediaplayerPlayDown",
- IDR2_MEDIAPLAYER_PLAY_BUTTON_DOWN, ui::SCALE_FACTOR_100P },
+ IDR_MEDIAPLAYER_PLAY_BUTTON_DOWN, ui::SCALE_FACTOR_100P },
{ "mediaplayerPlayDisabled",
- IDR2_MEDIAPLAYER_PLAY_BUTTON_DISABLED, ui::SCALE_FACTOR_100P },
+ IDR_MEDIAPLAYER_PLAY_BUTTON_DISABLED, ui::SCALE_FACTOR_100P },
{ "mediaplayerSoundLevel3",
- IDR2_MEDIAPLAYER_SOUND_LEVEL3_BUTTON, ui::SCALE_FACTOR_100P },
+ IDR_MEDIAPLAYER_SOUND_LEVEL3_BUTTON, ui::SCALE_FACTOR_100P },
{ "mediaplayerSoundLevel3Hover",
- IDR2_MEDIAPLAYER_SOUND_LEVEL3_BUTTON_HOVER, ui::SCALE_FACTOR_100P },
+ IDR_MEDIAPLAYER_SOUND_LEVEL3_BUTTON_HOVER, ui::SCALE_FACTOR_100P },
{ "mediaplayerSoundLevel3Down",
- IDR2_MEDIAPLAYER_SOUND_LEVEL3_BUTTON_DOWN, ui::SCALE_FACTOR_100P },
+ IDR_MEDIAPLAYER_SOUND_LEVEL3_BUTTON_DOWN, ui::SCALE_FACTOR_100P },
{ "mediaplayerSoundLevel2",
- IDR2_MEDIAPLAYER_SOUND_LEVEL2_BUTTON, ui::SCALE_FACTOR_100P },
+ IDR_MEDIAPLAYER_SOUND_LEVEL2_BUTTON, ui::SCALE_FACTOR_100P },
{ "mediaplayerSoundLevel2Hover",
- IDR2_MEDIAPLAYER_SOUND_LEVEL2_BUTTON_HOVER, ui::SCALE_FACTOR_100P },
+ IDR_MEDIAPLAYER_SOUND_LEVEL2_BUTTON_HOVER, ui::SCALE_FACTOR_100P },
{ "mediaplayerSoundLevel2Down",
- IDR2_MEDIAPLAYER_SOUND_LEVEL2_BUTTON_DOWN, ui::SCALE_FACTOR_100P },
+ IDR_MEDIAPLAYER_SOUND_LEVEL2_BUTTON_DOWN, ui::SCALE_FACTOR_100P },
{ "mediaplayerSoundLevel1",
- IDR2_MEDIAPLAYER_SOUND_LEVEL1_BUTTON, ui::SCALE_FACTOR_100P },
+ IDR_MEDIAPLAYER_SOUND_LEVEL1_BUTTON, ui::SCALE_FACTOR_100P },
{ "mediaplayerSoundLevel1Hover",
- IDR2_MEDIAPLAYER_SOUND_LEVEL1_BUTTON_HOVER, ui::SCALE_FACTOR_100P },
+ IDR_MEDIAPLAYER_SOUND_LEVEL1_BUTTON_HOVER, ui::SCALE_FACTOR_100P },
{ "mediaplayerSoundLevel1Down",
- IDR2_MEDIAPLAYER_SOUND_LEVEL1_BUTTON_DOWN, ui::SCALE_FACTOR_100P },
+ IDR_MEDIAPLAYER_SOUND_LEVEL1_BUTTON_DOWN, ui::SCALE_FACTOR_100P },
{ "mediaplayerSoundLevel0",
- IDR2_MEDIAPLAYER_SOUND_LEVEL0_BUTTON, ui::SCALE_FACTOR_100P },
+ IDR_MEDIAPLAYER_SOUND_LEVEL0_BUTTON, ui::SCALE_FACTOR_100P },
{ "mediaplayerSoundLevel0Hover",
- IDR2_MEDIAPLAYER_SOUND_LEVEL0_BUTTON_HOVER, ui::SCALE_FACTOR_100P },
+ IDR_MEDIAPLAYER_SOUND_LEVEL0_BUTTON_HOVER, ui::SCALE_FACTOR_100P },
{ "mediaplayerSoundLevel0Down",
- IDR2_MEDIAPLAYER_SOUND_LEVEL0_BUTTON_DOWN, ui::SCALE_FACTOR_100P },
+ IDR_MEDIAPLAYER_SOUND_LEVEL0_BUTTON_DOWN, ui::SCALE_FACTOR_100P },
{ "mediaplayerSoundDisabled",
- IDR2_MEDIAPLAYER_SOUND_DISABLED, ui::SCALE_FACTOR_100P },
+ IDR_MEDIAPLAYER_SOUND_DISABLED, ui::SCALE_FACTOR_100P },
{ "mediaplayerSliderThumb",
- IDR2_MEDIAPLAYER_SLIDER_THUMB, ui::SCALE_FACTOR_100P },
+ IDR_MEDIAPLAYER_SLIDER_THUMB, ui::SCALE_FACTOR_100P },
{ "mediaplayerSliderThumbHover",
- IDR2_MEDIAPLAYER_SLIDER_THUMB_HOVER, ui::SCALE_FACTOR_100P },
+ IDR_MEDIAPLAYER_SLIDER_THUMB_HOVER, ui::SCALE_FACTOR_100P },
{ "mediaplayerSliderThumbDown",
- IDR2_MEDIAPLAYER_SLIDER_THUMB_DOWN, ui::SCALE_FACTOR_100P },
+ IDR_MEDIAPLAYER_SLIDER_THUMB_DOWN, ui::SCALE_FACTOR_100P },
{ "mediaplayerVolumeSliderThumb",
- IDR2_MEDIAPLAYER_VOLUME_SLIDER_THUMB, ui::SCALE_FACTOR_100P },
+ IDR_MEDIAPLAYER_VOLUME_SLIDER_THUMB, ui::SCALE_FACTOR_100P },
{ "mediaplayerVolumeSliderThumbHover",
- IDR2_MEDIAPLAYER_VOLUME_SLIDER_THUMB_HOVER, ui::SCALE_FACTOR_100P },
+ IDR_MEDIAPLAYER_VOLUME_SLIDER_THUMB_HOVER, ui::SCALE_FACTOR_100P },
{ "mediaplayerVolumeSliderThumbDown",
- IDR2_MEDIAPLAYER_VOLUME_SLIDER_THUMB_DOWN, ui::SCALE_FACTOR_100P },
+ IDR_MEDIAPLAYER_VOLUME_SLIDER_THUMB_DOWN, ui::SCALE_FACTOR_100P },
{ "mediaplayerVolumeSliderThumbDisabled",
- IDR2_MEDIAPLAYER_VOLUME_SLIDER_THUMB_DISABLED, ui::SCALE_FACTOR_100P },
+ IDR_MEDIAPLAYER_VOLUME_SLIDER_THUMB_DISABLED, ui::SCALE_FACTOR_100P },
{ "mediaplayerClosedCaption",
- IDR2_MEDIAPLAYER_CLOSEDCAPTION_BUTTON, ui::SCALE_FACTOR_100P },
+ IDR_MEDIAPLAYER_CLOSEDCAPTION_BUTTON, ui::SCALE_FACTOR_100P },
{ "mediaplayerClosedCaptionHover",
- IDR2_MEDIAPLAYER_CLOSEDCAPTION_BUTTON_HOVER, ui::SCALE_FACTOR_100P },
+ IDR_MEDIAPLAYER_CLOSEDCAPTION_BUTTON_HOVER, ui::SCALE_FACTOR_100P },
{ "mediaplayerClosedCaptionDown",
- IDR2_MEDIAPLAYER_CLOSEDCAPTION_BUTTON_DOWN, ui::SCALE_FACTOR_100P },
+ IDR_MEDIAPLAYER_CLOSEDCAPTION_BUTTON_DOWN, ui::SCALE_FACTOR_100P },
{ "mediaplayerClosedCaptionDisabled",
- IDR2_MEDIAPLAYER_CLOSEDCAPTION_BUTTON_DISABLED, ui::SCALE_FACTOR_100P },
+ IDR_MEDIAPLAYER_CLOSEDCAPTION_BUTTON_DISABLED, ui::SCALE_FACTOR_100P },
{ "mediaplayerFullscreen",
- IDR2_MEDIAPLAYER_FULLSCREEN_BUTTON, ui::SCALE_FACTOR_100P },
+ IDR_MEDIAPLAYER_FULLSCREEN_BUTTON, ui::SCALE_FACTOR_100P },
{ "mediaplayerFullscreenHover",
- IDR2_MEDIAPLAYER_FULLSCREEN_BUTTON_HOVER, ui::SCALE_FACTOR_100P },
+ IDR_MEDIAPLAYER_FULLSCREEN_BUTTON_HOVER, ui::SCALE_FACTOR_100P },
{ "mediaplayerFullscreenDown",
- IDR2_MEDIAPLAYER_FULLSCREEN_BUTTON_DOWN, ui::SCALE_FACTOR_100P },
+ IDR_MEDIAPLAYER_FULLSCREEN_BUTTON_DOWN, ui::SCALE_FACTOR_100P },
{ "mediaplayerCastOff",
- IDR2_MEDIAPLAYER_CAST_BUTTON_OFF, ui::SCALE_FACTOR_100P },
+ IDR_MEDIAPLAYER_CAST_BUTTON_OFF, ui::SCALE_FACTOR_100P },
{ "mediaplayerCastOn",
- IDR2_MEDIAPLAYER_CAST_BUTTON_ON, ui::SCALE_FACTOR_100P },
+ IDR_MEDIAPLAYER_CAST_BUTTON_ON, ui::SCALE_FACTOR_100P },
{ "mediaplayerFullscreenDisabled",
- IDR2_MEDIAPLAYER_FULLSCREEN_BUTTON_DISABLED, ui::SCALE_FACTOR_100P },
+ IDR_MEDIAPLAYER_FULLSCREEN_BUTTON_DISABLED, ui::SCALE_FACTOR_100P },
{ "mediaplayerOverlayCastOff",
- IDR2_MEDIAPLAYER_OVERLAY_CAST_BUTTON_OFF, ui::SCALE_FACTOR_100P },
+ IDR_MEDIAPLAYER_OVERLAY_CAST_BUTTON_OFF, ui::SCALE_FACTOR_100P },
{ "mediaplayerOverlayPlay",
- IDR2_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 },
+ IDR_MEDIAPLAYER_OVERLAY_PLAY_BUTTON, 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, 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 },
+ IDR_SEARCH_MAGNIFIER_RESULTS, 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, ui::SCALE_FACTOR_100P },
+ 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 },
{ "view-source.css", IDR_UASTYLE_VIEW_SOURCE_CSS, ui::SCALE_FACTOR_NONE },
diff --git a/content/content_shell.gypi b/content/content_shell.gypi
index 7339490..c592ede 100644
--- a/content/content_shell.gypi
+++ b/content/content_shell.gypi
@@ -500,7 +500,7 @@
'action_name': 'repack_content_shell_pack',
'variables': {
'pak_inputs': [
- '<(SHARED_INTERMEDIATE_DIR)/blink/public/resources/blink_resources.pak',
+ '<(SHARED_INTERMEDIATE_DIR)/blink/public/resources/blink_resources_100_percent.pak',
'<(SHARED_INTERMEDIATE_DIR)/content/app/resources/content_resources_100_percent.pak',
'<(SHARED_INTERMEDIATE_DIR)/content/app/strings/content_strings_en-US.pak',
'<(SHARED_INTERMEDIATE_DIR)/content/browser/tracing/tracing_resources.pak',
diff --git a/content/shell/BUILD.gn b/content/shell/BUILD.gn
index 96cee7c..87d31bf 100644
--- a/content/shell/BUILD.gn
+++ b/content/shell/BUILD.gn
@@ -452,7 +452,7 @@ group("resources") {
repack("pak") {
sources = [
- "$root_gen_dir/blink/public/resources/blink_resources.pak",
+ "$root_gen_dir/blink/public/resources/blink_resources_100_percent.pak",
"$root_gen_dir/content/app/resources/content_resources_100_percent.pak",
"$root_gen_dir/content/app/strings/content_strings_en-US.pak",
"$root_gen_dir/content/browser/tracing/tracing_resources.pak",
diff --git a/content/shell/common/shell_content_client.cc b/content/shell/common/shell_content_client.cc
index 9b9781d..a438823 100644
--- a/content/shell/common/shell_content_client.cc
+++ b/content/shell/common/shell_content_client.cc
@@ -7,6 +7,7 @@
#include "base/command_line.h"
#include "base/strings/string_piece.h"
#include "base/strings/utf_string_conversions.h"
+#include "blink/public/resources/grit/blink_resources.h"
#include "content/app/resources/grit/content_resources.h"
#include "content/app/strings/grit/content_strings.h"
#include "content/public/common/content_switches.h"
@@ -64,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
@@ -72,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;
}