Move webkit resources over to content.

And while I'm at it, change the includes to use the qualified path for
the grit generated header file
($gen_dir/content/app/resources/grit/content_resources.h).

BUG=338338
TEST=None
R=avi@chromium.org,jamesr@chromium.org,thestig@chromium.org,tony@chromium.org
TBR=darin@chromium.org

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

Cr-Commit-Position: refs/heads/master@{#291369}
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@291369 0039d316-1c4b-4281-b951-d872f2087c98

3 files changed, 0 insertions, 174 deletions

diff --git a/webkit/glue/resources/BUILD.gn b/webkit/glue/resources/BUILD.gn
deleted file mode 100644
index c467e9f..0000000
--- a/webkit/glue/resources/BUILD.gn
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 2014 The Chromium Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-import("//tools/grit/grit_rule.gni")
-
-grit("resources") {
-  source = "webkit_resources.grd"
-  output_dir = "$root_gen_dir/webkit"
-  outputs = [
-    "grit/webkit_resources.h",
-    "webkit_resources_100_percent.pak",
-    "webkit_resources_200_percent.pak",
-  ]
-}
diff --git a/webkit/glue/resources/webkit_resources.grd b/webkit/glue/resources/webkit_resources.grd
deleted file mode 100644
index 42654c5..0000000
--- a/webkit/glue/resources/webkit_resources.grd
+++ /dev/null
@@ -1,133 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<grit latest_public_release="0" current_release="1">
-  <outputs>
-    <output filename="grit/webkit_resources.h" type="rc_header" context="default_100_percent">
-      <emit emit_type='prepend'></emit>
-    </output>
-    <output filename="webkit_resources_100_percent.pak" type="data_package" context="default_100_percent" />
-    <output filename="webkit_resources_200_percent.pak" type="data_package" context="default_200_percent" />
-  </outputs>
-  <release seq="1">
-    <structures fallback_to_low_resolution="true">
-      <structure type="chrome_scaled_image" name="IDR_BROKENIMAGE" file="broken_image.png" />
-      <structure type="chrome_scaled_image" name="IDR_MEDIAPLAYER_PAUSE_BUTTON" file="mediaplayer_pause.png" />
-      <structure type="chrome_scaled_image" name="IDR_MEDIAPLAYER_PAUSE_BUTTON_HOVER" file="mediaplayer_pause_hover.png" />
-      <structure type="chrome_scaled_image" name="IDR_MEDIAPLAYER_PAUSE_BUTTON_DOWN" file="mediaplayer_pause_down.png" />
-      <structure type="chrome_scaled_image" name="IDR_MEDIAPLAYER_PLAY_BUTTON" file="mediaplayer_play.png" />
-      <structure type="chrome_scaled_image" name="IDR_MEDIAPLAYER_PLAY_BUTTON_HOVER" file="mediaplayer_play_hover.png" />
-      <structure type="chrome_scaled_image" name="IDR_MEDIAPLAYER_PLAY_BUTTON_DOWN" file="mediaplayer_play_down.png" />
-      <structure type="chrome_scaled_image" name="IDR_MEDIAPLAYER_PLAY_BUTTON_DISABLED" file="mediaplayer_play_disabled.png" />
-      <structure type="chrome_scaled_image" name="IDR_MEDIAPLAYER_SOUND_LEVEL3_BUTTON" file="mediaplayer_sound_level3.png" />
-      <structure type="chrome_scaled_image" name="IDR_MEDIAPLAYER_SOUND_LEVEL3_BUTTON_HOVER" file="mediaplayer_sound_level3_hover.png" />
-      <structure type="chrome_scaled_image" name="IDR_MEDIAPLAYER_SOUND_LEVEL3_BUTTON_DOWN" file="mediaplayer_sound_level3_down.png" />
-      <structure type="chrome_scaled_image" name="IDR_MEDIAPLAYER_SOUND_LEVEL2_BUTTON" file="mediaplayer_sound_level2.png" />
-      <structure type="chrome_scaled_image" name="IDR_MEDIAPLAYER_SOUND_LEVEL2_BUTTON_HOVER" file="mediaplayer_sound_level2_hover.png" />
-      <structure type="chrome_scaled_image" name="IDR_MEDIAPLAYER_SOUND_LEVEL2_BUTTON_DOWN" file="mediaplayer_sound_level2_down.png" />
-      <structure type="chrome_scaled_image" name="IDR_MEDIAPLAYER_SOUND_LEVEL1_BUTTON" file="mediaplayer_sound_level1.png" />
-      <structure type="chrome_scaled_image" name="IDR_MEDIAPLAYER_SOUND_LEVEL1_BUTTON_HOVER" file="mediaplayer_sound_level1_hover.png" />
-      <structure type="chrome_scaled_image" name="IDR_MEDIAPLAYER_SOUND_LEVEL1_BUTTON_DOWN" file="mediaplayer_sound_level1_down.png" />
-      <structure type="chrome_scaled_image" name="IDR_MEDIAPLAYER_SOUND_LEVEL0_BUTTON" file="mediaplayer_sound_level0.png" />
-      <structure type="chrome_scaled_image" name="IDR_MEDIAPLAYER_SOUND_LEVEL0_BUTTON_HOVER" file="mediaplayer_sound_level0_hover.png" />
-      <structure type="chrome_scaled_image" name="IDR_MEDIAPLAYER_SOUND_LEVEL0_BUTTON_DOWN" file="mediaplayer_sound_level0_down.png" />
-      <structure type="chrome_scaled_image" name="IDR_MEDIAPLAYER_SOUND_DISABLED" file="mediaplayer_sound_disabled.png" />
-      <structure type="chrome_scaled_image" name="IDR_MEDIAPLAYER_SLIDER_THUMB" file="mediaplayer_slider_thumb.png" />
-      <structure type="chrome_scaled_image" name="IDR_MEDIAPLAYER_SLIDER_THUMB_HOVER" file="mediaplayer_slider_thumb_hover.png" />
-      <structure type="chrome_scaled_image" name="IDR_MEDIAPLAYER_SLIDER_THUMB_DOWN" file="mediaplayer_slider_thumb_down.png" />
-      <structure type="chrome_scaled_image" name="IDR_MEDIAPLAYER_VOLUME_SLIDER_THUMB" file="mediaplayer_volume_slider_thumb.png" />
-      <structure type="chrome_scaled_image" name="IDR_MEDIAPLAYER_VOLUME_SLIDER_THUMB_HOVER" file="mediaplayer_volume_slider_thumb_hover.png" />
-      <structure type="chrome_scaled_image" name="IDR_MEDIAPLAYER_VOLUME_SLIDER_THUMB_DOWN" file="mediaplayer_volume_slider_thumb_down.png" />
-      <structure type="chrome_scaled_image" name="IDR_MEDIAPLAYER_VOLUME_SLIDER_THUMB_DISABLED" file="mediaplayer_volume_slider_thumb_disabled.png" />
-      <structure type="chrome_scaled_image" name="IDR_MEDIAPLAYER_CLOSEDCAPTION_BUTTON" file="mediaplayer_closedcaption.png" />
-      <structure type="chrome_scaled_image" name="IDR_MEDIAPLAYER_CLOSEDCAPTION_BUTTON_HOVER" file="mediaplayer_closedcaption_hover.png" />
-      <structure type="chrome_scaled_image" name="IDR_MEDIAPLAYER_CLOSEDCAPTION_BUTTON_DOWN" file="mediaplayer_closedcaption_down.png" />
-      <structure type="chrome_scaled_image" name="IDR_MEDIAPLAYER_CLOSEDCAPTION_BUTTON_DISABLED" file="mediaplayer_closedcaption_disabled.png" />
-      <structure type="chrome_scaled_image" name="IDR_MEDIAPLAYER_FULLSCREEN_BUTTON" file="mediaplayer_fullscreen.png" />
-      <structure type="chrome_scaled_image" name="IDR_MEDIAPLAYER_FULLSCREEN_BUTTON_HOVER" file="mediaplayer_fullscreen_hover.png" />
-      <structure type="chrome_scaled_image" name="IDR_MEDIAPLAYER_FULLSCREEN_BUTTON_DOWN" file="mediaplayer_fullscreen_down.png" />
-      <structure type="chrome_scaled_image" name="IDR_MEDIAPLAYER_FULLSCREEN_BUTTON_DISABLED" file="mediaplayer_fullscreen_disabled.png" />
-      <structure type="chrome_scaled_image" name="IDR_MEDIAPLAYER_OVERLAY_PLAY_BUTTON" file="mediaplayer_overlay_play.png" />
-      <if expr="is_macosx">
-        <structure type="chrome_scaled_image" name="IDR_OVERHANG_PATTERN" file="overhang_pattern.png" />
-        <structure type="chrome_scaled_image" name="IDR_OVERHANG_SHADOW" file="overhang_shadow.png" />
-        <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" />
-        <structure type="chrome_scaled_image" name="IDR_EAST_RESIZE_CURSOR" file="east_resize_cursor.png" />
-        <structure type="chrome_scaled_image" name="IDR_EASTWEST_RESIZE_CURSOR" file="east_west_resize_cursor.png" />
-        <structure type="chrome_scaled_image" name="IDR_HELP_CURSOR" file="help_cursor.png" />
-        <structure type="chrome_scaled_image" name="IDR_LINK_CURSOR" file="link_cursor.png" />
-        <structure type="chrome_scaled_image" name="IDR_MOVE_CURSOR" file="move_cursor.png" />
-        <structure type="chrome_scaled_image" name="IDR_NONE_CURSOR" file="none_cursor.png" />
-        <structure type="chrome_scaled_image" name="IDR_NORTHEAST_RESIZE_CURSOR" file="north_east_resize_cursor.png" />
-        <structure type="chrome_scaled_image" name="IDR_NORTHEASTSOUTHWEST_RESIZE_CURSOR" file="north_east_south_west_resize_cursor.png" />
-        <structure type="chrome_scaled_image" name="IDR_NORTH_RESIZE_CURSOR" file="north_resize_cursor.png" />
-        <structure type="chrome_scaled_image" name="IDR_NORTHSOUTH_RESIZE_CURSOR" file="north_south_resize_cursor.png" />
-        <structure type="chrome_scaled_image" name="IDR_NORTHWEST_RESIZE_CURSOR" file="north_west_resize_cursor.png" />
-        <structure type="chrome_scaled_image" name="IDR_NORTHWESTSOUTHEAST_RESIZE_CURSOR" file="north_west_south_east_resize_cursor.png" />
-        <structure type="chrome_scaled_image" name="IDR_PROGRESS_CURSOR" file="progress_cursor.png" />
-        <structure type="chrome_scaled_image" name="IDR_SOUTHEAST_RESIZE_CURSOR" file="south_east_resize_cursor.png" />
-        <structure type="chrome_scaled_image" name="IDR_SOUTH_RESIZE_CURSOR" file="south_resize_cursor.png" />
-        <structure type="chrome_scaled_image" name="IDR_SOUTHWEST_RESIZE_CURSOR" file="south_west_resize_cursor.png" />
-        <structure type="chrome_scaled_image" name="IDR_VERTICALTEXT_CURSOR" file="vertical_text_cursor.png" />
-        <structure type="chrome_scaled_image" name="IDR_WAIT_CURSOR" file="wait_cursor.png" />
-        <structure type="chrome_scaled_image" name="IDR_WEST_RESIZE_CURSOR" file="west_resize_cursor.png" />
-        <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="IDR_PAN_SCROLL_ICON" file="pan_icon.png" />
-      <structure type="chrome_scaled_image" name="IDR_SEARCH_CANCEL" file="search_cancel.png" />
-      <structure type="chrome_scaled_image" name="IDR_SEARCH_CANCEL_PRESSED" file="search_cancel_pressed.png" />
-      <structure type="chrome_scaled_image" name="IDR_SEARCH_MAGNIFIER" file="search_magnifier.png" />
-      <structure type="chrome_scaled_image" name="IDR_SEARCH_MAGNIFIER_RESULTS" file="search_magnifier_results.png" />
-      <structure type="chrome_scaled_image" name="IDR_TEXTAREA_RESIZER" file="textarea_resize_corner.png" />
-      <if expr="enable_plugins">
-        <structure type="chrome_scaled_image" name="IDR_PDF_BUTTON_FTP" file="pdf_button_ftp.png" />
-        <structure type="chrome_scaled_image" name="IDR_PDF_BUTTON_FTP_HOVER" file="pdf_button_ftp_hover.png" />
-        <structure type="chrome_scaled_image" name="IDR_PDF_BUTTON_FTP_PRESSED" file="pdf_button_ftp_pressed.png" />
-        <structure type="chrome_scaled_image" name="IDR_PDF_BUTTON_FTW" file="pdf_button_ftw.png" />
-        <structure type="chrome_scaled_image" name="IDR_PDF_BUTTON_FTW_HOVER" file="pdf_button_ftw_hover.png" />
-        <structure type="chrome_scaled_image" name="IDR_PDF_BUTTON_FTW_PRESSED" file="pdf_button_ftw_pressed.png" />
-        <structure type="chrome_scaled_image" name="IDR_PDF_BUTTON_ZOOMIN_END" file="pdf_button_zoomin_end.png" />
-        <structure type="chrome_scaled_image" name="IDR_PDF_BUTTON_ZOOMIN_END_HOVER" file="pdf_button_zoomin_end_hover.png" />
-        <structure type="chrome_scaled_image" name="IDR_PDF_BUTTON_ZOOMIN_END_PRESSED" file="pdf_button_zoomin_end_pressed.png" />
-        <structure type="chrome_scaled_image" name="IDR_PDF_BUTTON_ZOOMIN" file="pdf_button_zoomin.png" />
-        <structure type="chrome_scaled_image" name="IDR_PDF_BUTTON_ZOOMIN_HOVER" file="pdf_button_zoomin_hover.png" />
-        <structure type="chrome_scaled_image" name="IDR_PDF_BUTTON_ZOOMIN_PRESSED" file="pdf_button_zoomin_pressed.png" />
-        <structure type="chrome_scaled_image" name="IDR_PDF_BUTTON_ZOOMOUT" file="pdf_button_zoomout.png" />
-        <structure type="chrome_scaled_image" name="IDR_PDF_BUTTON_ZOOMOUT_HOVER" file="pdf_button_zoomout_hover.png" />
-        <structure type="chrome_scaled_image" name="IDR_PDF_BUTTON_ZOOMOUT_PRESSED" file="pdf_button_zoomout_pressed.png" />
-        <structure type="chrome_scaled_image" name="IDR_PDF_BUTTON_SAVE" file="pdf_button_save.png" />
-        <structure type="chrome_scaled_image" name="IDR_PDF_BUTTON_SAVE_HOVER" file="pdf_button_save_hover.png" />
-        <structure type="chrome_scaled_image" name="IDR_PDF_BUTTON_SAVE_PRESSED" file="pdf_button_save_pressed.png" />
-        <structure type="chrome_scaled_image" name="IDR_PDF_BUTTON_PRINT" file="pdf_button_print.png" />
-        <structure type="chrome_scaled_image" name="IDR_PDF_BUTTON_PRINT_HOVER" file="pdf_button_print_hover.png" />
-        <structure type="chrome_scaled_image" name="IDR_PDF_BUTTON_PRINT_PRESSED" file="pdf_button_print_pressed.png" />
-        <structure type="chrome_scaled_image" name="IDR_PDF_BUTTON_PRINT_DISABLED" file="pdf_button_print_disabled.png" />
-        <structure type="chrome_scaled_image" name="IDR_PDF_THUMBNAIL_0" file="pdf_thumbnail_0.png" />
-        <structure type="chrome_scaled_image" name="IDR_PDF_THUMBNAIL_1" file="pdf_thumbnail_1.png" />
-        <structure type="chrome_scaled_image" name="IDR_PDF_THUMBNAIL_2" file="pdf_thumbnail_2.png" />
-        <structure type="chrome_scaled_image" name="IDR_PDF_THUMBNAIL_3" file="pdf_thumbnail_3.png" />
-        <structure type="chrome_scaled_image" name="IDR_PDF_THUMBNAIL_4" file="pdf_thumbnail_4.png" />
-        <structure type="chrome_scaled_image" name="IDR_PDF_THUMBNAIL_5" file="pdf_thumbnail_5.png" />
-        <structure type="chrome_scaled_image" name="IDR_PDF_THUMBNAIL_6" file="pdf_thumbnail_6.png" />
-        <structure type="chrome_scaled_image" name="IDR_PDF_THUMBNAIL_7" file="pdf_thumbnail_7.png" />
-        <structure type="chrome_scaled_image" name="IDR_PDF_THUMBNAIL_8" file="pdf_thumbnail_8.png" />
-        <structure type="chrome_scaled_image" name="IDR_PDF_THUMBNAIL_9" file="pdf_thumbnail_9.png" />
-        <structure type="chrome_scaled_image" name="IDR_PDF_THUMBNAIL_NUM_BACKGROUND" file="pdf_thumbnail_num_background.png" />
-        <structure type="chrome_scaled_image" name="IDR_PDF_PROGRESS_BAR_0" file="pdf_progress_0.png" />
-        <structure type="chrome_scaled_image" name="IDR_PDF_PROGRESS_BAR_1" file="pdf_progress_1.png" />
-        <structure type="chrome_scaled_image" name="IDR_PDF_PROGRESS_BAR_2" file="pdf_progress_2.png" />
-        <structure type="chrome_scaled_image" name="IDR_PDF_PROGRESS_BAR_3" file="pdf_progress_3.png" />
-        <structure type="chrome_scaled_image" name="IDR_PDF_PROGRESS_BAR_4" file="pdf_progress_4.png" />
-        <structure type="chrome_scaled_image" name="IDR_PDF_PROGRESS_BAR_5" file="pdf_progress_5.png" />
-        <structure type="chrome_scaled_image" name="IDR_PDF_PROGRESS_BAR_6" file="pdf_progress_6.png" />
-        <structure type="chrome_scaled_image" name="IDR_PDF_PROGRESS_BAR_7" file="pdf_progress_7.png" />
-        <structure type="chrome_scaled_image" name="IDR_PDF_PROGRESS_BAR_8" file="pdf_progress_8.png" />
-        <structure type="chrome_scaled_image" name="IDR_PDF_PROGRESS_BAR_BACKGROUND" file="pdf_progress_background.png" />
-        <structure type="chrome_scaled_image" name="IDR_PDF_PAGE_INDICATOR_BACKGROUND" file="pdf_page_indicator_background.png" />
-        <structure type="chrome_scaled_image" name="IDR_PDF_PAGE_DROPSHADOW" file="pdf_dropshadow.png" />
-      </if>
-      <structure type="chrome_scaled_image" name="IDR_PASSWORD_GENERATION_ICON" file="password_generation.png" />
-      <structure type="chrome_scaled_image" name="IDR_PASSWORD_GENERATION_ICON_HOVER" file="password_generation_hover.png" />
-    </structures>
-  </release>
-</grit>
diff --git a/webkit/glue/resources/webkit_resources.gyp b/webkit/glue/resources/webkit_resources.gyp
deleted file mode 100644
index 7d34e0d..0000000
--- a/webkit/glue/resources/webkit_resources.gyp
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 2014 The Chromium Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-{
-  'targets': [
-    {
-      # GN version: //webkit/glue/resources
-      'target_name': 'webkit_resources',
-      'type': 'none',
-      'variables': {
-        'grit_out_dir': '<(SHARED_INTERMEDIATE_DIR)/webkit',
-      },
-      'actions': [
-        {
-          'action_name': 'generate_webkit_resources',
-          'variables': {
-            'grit_grd_file': 'webkit_resources.grd',
-          },
-          'includes': [ '../../../build/grit_action.gypi' ],
-        },
-      ],
-      'includes': [ '../../../build/grit_target.gypi' ],
-    },
-  ]
-}