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

android_webview/android_webview.gyp

@@ -63,22 +63,22 @@
       'target_name': 'android_webview_pak',
       'type': 'none',
       'dependencies': [
+        '<(DEPTH)/content/app/resources/content_resources.gyp:content_resources',
         '<(DEPTH)/content/content_resources.gyp:content_resources',
         '<(DEPTH)/net/net.gyp:net_resources',
         '<(DEPTH)/third_party/WebKit/public/blink_resources.gyp:blink_resources',
         '<(DEPTH)/ui/resources/ui_resources.gyp:ui_resources',
-        '<(DEPTH)/webkit/glue/resources/webkit_resources.gyp:webkit_resources',
       ],
       'actions': [
         {
           'action_name': 'repack_android_webview_pack',
           'variables': {
             'pak_inputs': [
               '<(SHARED_INTERMEDIATE_DIR)/blink/public/resources/blink_resources.pak',
+              '<(SHARED_INTERMEDIATE_DIR)/content/app/resources/content_resources_100_percent.pak',
               '<(SHARED_INTERMEDIATE_DIR)/content/content_resources.pak',
               '<(SHARED_INTERMEDIATE_DIR)/net/net_resources.pak',
               '<(SHARED_INTERMEDIATE_DIR)/ui/resources/ui_resources_100_percent.pak',
-              '<(SHARED_INTERMEDIATE_DIR)/webkit/webkit_resources_100_percent.pak',
             ],
             'pak_output': '<(PRODUCT_DIR)/android_webview_apk/assets/webviewchromium.pak',
           },

athena/resources/athena_resources.gyp

@@ -29,11 +29,11 @@
       'type': 'none',
       'dependencies': [
         '../../ash/ash_resources.gyp:ash_resources',
+        '../../content/app/resources/content_resources.gyp:content_resources',
         '../../content/app/strings/content_strings.gyp:content_strings',
         '../../extensions/extensions.gyp:extensions_shell_and_test_pak',
         '../../ui/chromeos/ui_chromeos.gyp:ui_chromeos_resources',
         '../../ui/chromeos/ui_chromeos.gyp:ui_chromeos_strings',
-        '../../webkit/glue/resources/webkit_resources.gyp:webkit_resources',
         'athena_resources',
       ],
       'actions': [{
@@ -43,10 +43,10 @@
             '<(PRODUCT_DIR)/extensions_shell_and_test.pak',
             '<(SHARED_INTERMEDIATE_DIR)/ash/resources/ash_resources_100_percent.pak',
             '<(SHARED_INTERMEDIATE_DIR)/athena/resources/athena_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)/ui/chromeos/resources/ui_chromeos_resources_100_percent.pak',
             '<(SHARED_INTERMEDIATE_DIR)/ui/chromeos/strings/ui_chromeos_strings_en-US.pak',
-            '<(SHARED_INTERMEDIATE_DIR)/webkit/webkit_resources_100_percent.pak',
           ],
           'pak_output': '<(PRODUCT_DIR)/athena_resources.pak',
         },

chrome/BUILD.gn

@@ -112,11 +112,11 @@ shared_library("main_dll") {
       # Chromium functionality into this .dll.
       #'chrome_version_resources',  TODO(GYP)
       "//chrome/app/theme:chrome_unscaled_resources",
+      "//content/app/resources",
       "//crypto",
       "//net:resources",
       "//third_party/wtl",
       "//ui/views",
-      "//webkit/glue/resources",
       #'<(DEPTH)/chrome_elf/chrome_elf.gyp:chrome_elf' ]  TODO(GYP)
     ]
     if (enable_configuration_policy) {

chrome/browser/BUILD.gn

@@ -156,6 +156,7 @@ static_library("browser") {
       "//components/visitedlink/browser",
       "//components/visitedlink/common",
       "//components/web_modal",
+      "//content/app/resources",
       "//media",
       "//media/cast:net",
       "//mojo/environment:chromium",
@@ -179,7 +180,6 @@ static_library("browser") {
       "//webkit/browser:storage",
       "//webkit/common",
       "//webkit/common:storage",
-      "//webkit/glue/resources",
       #"apps",  TODO(GYP)
       ## TODO(tonyg): Remove this dependency (crbug.com/280157).
       #"../testing/perf/perf_test.gyp:*",  TODO(GYP)

chrome/browser/extensions/BUILD.gn

@@ -47,6 +47,7 @@ static_library("extensions") {
     "//components/onc",
     "//components/strings",
     "//components/url_matcher",
+    "//content/app/resources",
     "//content/public/browser",
     "//content/public/common",
     "//crypto",
@@ -72,7 +73,6 @@ static_library("extensions") {
     "//url",
     "//webkit/browser:storage",
     "//webkit/common:storage",
-    "//webkit/glue/resources",
     #"../third_party/webrtc/modules/modules.gyp:desktop_capture",  TODO(GYP)
   ]
 

chrome/browser/ui/BUILD.gn

@@ -88,6 +88,7 @@ static_library("ui") {
       "//chrome/common/extensions/api:api",
       "//chrome/installer/util",
       "//components/autofill/content/browser:risk_proto",
+      "//content/app/resources",
       "//device/bluetooth",
       "//device/nfc",
       "//media",
@@ -107,7 +108,6 @@ static_library("ui") {
       "//webkit/browser:storage",
       "//webkit/common",
       "//webkit/common:storage",
-      "//webkit/glue/resources",
       #'../third_party/libjingle/libjingle.gyp:libjingle',  TODO(GYP)
     ]
     # TODO(GYP)

chrome/browser/ui/views/DEPS

@@ -1,5 +1,6 @@
 include_rules = [
  "-chrome/browser/ui/libgtk2ui",
+ "+content/app/resources/grit/content_resources.h",
  "+chrome/browser/ui/views",
  "+components/user_manager"
 ]

chrome/browser/ui/views/frame/browser_view.cc

@@ -101,6 +101,7 @@
 #include "components/password_manager/core/browser/password_manager.h"
 #include "components/signin/core/common/profile_management_switches.h"
 #include "components/translate/core/browser/language_state.h"
+#include "content/app/resources/grit/content_resources.h"
 #include "content/public/browser/download_manager.h"
 #include "content/public/browser/native_web_keyboard_event.h"
 #include "content/public/browser/notification_service.h"
@@ -114,7 +115,6 @@
 #include "grit/locale_settings.h"
 #include "grit/theme_resources.h"
 #include "grit/ui_strings.h"
-#include "grit/webkit_resources.h"
 #include "ui/accessibility/ax_view_state.h"
 #include "ui/aura/client/window_tree_client.h"
 #include "ui/aura/window.h"

chrome/chrome_browser.gypi

@@ -2935,6 +2935,7 @@
             '../components/components.gyp:visitedlink_browser',
             '../components/components.gyp:visitedlink_common',
             '../components/components.gyp:web_modal',
+            '../content/app/resources/content_resources.gyp:content_resources',
             '../media/cast/cast.gyp:cast_net',
             '../media/media.gyp:media',
             '../mojo/mojo_base.gyp:mojo_common_lib',
@@ -2959,7 +2960,6 @@
             '../v8/tools/gyp/v8.gyp:v8',
             '../webkit/storage_browser.gyp:webkit_storage_browser',
             '../webkit/storage_common.gyp:webkit_storage_common',
-            '../webkit/glue/resources/webkit_resources.gyp:webkit_resources',
           ],
           'sources': [
             '<@(chrome_browser_non_ios_sources)',

chrome/chrome_browser_chromeos.gypi

@@ -60,6 +60,7 @@
         '../components/components.gyp:variations',
         '../components/components.gyp:variations_http_provider',
         '../components/components_strings.gyp:components_strings',
+        '../content/app/resources/content_resources.gyp:content_resources',
         '../content/content.gyp:content_browser',
         '../content/content.gyp:content_common',
         '../crypto/crypto.gyp:crypto',
@@ -104,7 +105,6 @@
         '../v8/tools/gyp/v8.gyp:v8',
         '../webkit/storage_browser.gyp:webkit_storage_browser',
         '../webkit/storage_common.gyp:webkit_storage_common',
-        '../webkit/glue/resources/webkit_resources.gyp:webkit_resources',
         'chrome_resources.gyp:chrome_strings',
       ],
       'defines': [

chrome/chrome_browser_extensions.gypi

@@ -981,6 +981,7 @@
         '../components/components.gyp:onc_component',
         '../components/components.gyp:url_matcher',
         '../components/components_strings.gyp:components_strings',
+        '../content/app/resources/content_resources.gyp:content_resources',
         '../content/content.gyp:content_browser',
         '../content/content.gyp:content_common',
         '../crypto/crypto.gyp:crypto',
@@ -1007,7 +1008,6 @@
         '../url/url.gyp:url_lib',
         '../webkit/storage_browser.gyp:webkit_storage_browser',
         '../webkit/storage_common.gyp:webkit_storage_common',
-        '../webkit/glue/resources/webkit_resources.gyp:webkit_resources',
       ],
       'include_dirs': [
         '..',

chrome/chrome_browser_ui.gypi

@@ -2611,6 +2611,7 @@
             'installer_util',
             '../components/components.gyp:autofill_content_risk_proto',
             '../components/components.gyp:translate_content_common',
+            '../content/app/resources/content_resources.gyp:content_resources',
             '../media/media.gyp:media',
             '../mojo/mojo_base.gyp:mojo_system_impl',
             '../net/net.gyp:net_with_v8',
@@ -2626,7 +2627,6 @@
             '../v8/tools/gyp/v8.gyp:v8',
             '../webkit/storage_browser.gyp:webkit_storage_browser',
             '../webkit/storage_common.gyp:webkit_storage_common',
-            '../webkit/glue/resources/webkit_resources.gyp:webkit_resources',
           ],
           'defines': [
             '<@(nacl_defines)',

chrome/chrome_dll.gypi

@@ -111,10 +111,10 @@
                 # up actual Chromium functionality into this .dll.
                 'chrome_version_resources',
                 '../chrome/chrome_resources.gyp:chrome_unscaled_resources',
+                '../content/app/resources/content_resources.gyp:content_resources',
                 '../crypto/crypto.gyp:crypto',
                 '../net/net.gyp:net_resources',
                 '../ui/views/views.gyp:views',
-                '../webkit/glue/resources/webkit_resources.gyp:webkit_resources',
               ],
               'sources': [
                 'app/chrome_command_ids.h',

chrome/chrome_renderer.gypi

@@ -284,6 +284,7 @@
         '../components/components.gyp:translate_core_common',
         '../components/components.gyp:translate_core_language_detection',
         '../components/components.gyp:visitedlink_renderer',
+        '../content/app/resources/content_resources.gyp:content_resources',
         '../content/app/strings/content_strings.gyp:content_strings',
         '../content/content.gyp:content_renderer',
         '../extensions/extensions.gyp:extensions_renderer',
@@ -299,7 +300,6 @@
         '../third_party/npapi/npapi.gyp:npapi',
         '../third_party/widevine/cdm/widevine_cdm.gyp:widevine_cdm_version_h',
         '../ui/surface/surface.gyp:surface',
-        '../webkit/glue/resources/webkit_resources.gyp:webkit_resources',
       ],
       'include_dirs': [
         '..',

chrome/chrome_repack_chrome_100_percent.gypi

@@ -14,7 +14,7 @@
     'conditions': [
       ['OS != "ios"', {
         'pak_inputs': [
-          '<(SHARED_INTERMEDIATE_DIR)/webkit/webkit_resources_100_percent.pak',
+          '<(SHARED_INTERMEDIATE_DIR)/content/app/resources/content_resources_100_percent.pak',
         ],
       }],
       ['use_ash==1', {

chrome/chrome_repack_chrome_200_percent.gypi

@@ -14,7 +14,7 @@
     'conditions': [
       ['OS != "ios"', {
         'pak_inputs': [
-          '<(SHARED_INTERMEDIATE_DIR)/webkit/webkit_resources_200_percent.pak',
+          '<(SHARED_INTERMEDIATE_DIR)/content/app/resources/content_resources_200_percent.pak',
         ],
       }],
       ['use_ash==1', {

chrome/chrome_resources.gyp

@@ -445,10 +445,10 @@
       'conditions': [
         ['OS != "ios"', {
           'dependencies': [
+            '<(DEPTH)/content/app/resources/content_resources.gyp:content_resources',
             '<(DEPTH)/content/app/strings/content_strings.gyp:content_strings',
             '<(DEPTH)/content/content_resources.gyp:content_resources',
             '<(DEPTH)/third_party/WebKit/public/blink_resources.gyp:blink_resources',
-            '<(DEPTH)/webkit/glue/resources/webkit_resources.gyp:webkit_resources',
           ],
         }],
         ['use_ash==1', {

chrome/chrome_tests.gypi

@@ -18,6 +18,7 @@
         'debugger',
         'renderer',
         'test_support_common',
+        '../content/app/resources/content_resources.gyp:content_resources',
         '../google_apis/google_apis.gyp:google_apis_test_support',
         '../net/net.gyp:net',
         '../net/net.gyp:net_resources',
@@ -36,7 +37,6 @@
         '../third_party/zlib/zlib.gyp:zlib',
         '../ui/base/ui_base.gyp:ui_base_test_support',
         '../ui/web_dialogs/web_dialogs.gyp:web_dialogs_test_support',
-        '../webkit/glue/resources/webkit_resources.gyp:webkit_resources',
       ],
       'include_dirs': [
         '..',

chrome/chrome_tests_unit.gypi

@@ -1999,6 +1999,7 @@
             '../components/components.gyp:component_metrics_proto',
             '../components/components.gyp:data_reduction_proxy_test_support',
             '../components/components_strings.gyp:components_strings',
+            '../content/app/resources/content_resources.gyp:content_resources',
             '../extensions/extensions_resources.gyp:extensions_resources',
             '../extensions/extensions_strings.gyp:extensions_strings',
             '../gpu/gpu.gyp:gpu_unittest_utils',
@@ -2011,7 +2012,6 @@
             '../tools/json_schema_compiler/test/json_schema_compiler_tests.gyp:json_schema_compiler_tests',
             '../ui/gl/gl.gyp:gl',
             '../v8/tools/gyp/v8.gyp:v8',
-            '../webkit/glue/resources/webkit_resources.gyp:webkit_resources',
           ],
           # TODO(scr): Use this in browser_tests too.
           'includes': [

chrome/renderer/BUILD.gn

@@ -43,6 +43,7 @@ static_library("renderer") {
     "//components/translate/core/common",
     "//components/translate/core/language_detection",
     "//components/visitedlink/renderer",
+    "//content/app/resources",
     "//content/app/strings",
     "//content/public/renderer",
     "//extensions:extensions_resources",
@@ -62,7 +63,6 @@ static_library("renderer") {
     "//v8:v8",
     "//webkit/child",
     "//webkit/common",
-    "//webkit/glue/resources",
   ]
 
   if (enable_nacl) {

chrome/renderer/DEPS

@@ -18,6 +18,7 @@ include_rules = [
   "+components/translate/core/common",
   "+components/translate/core/language_detection",
   "+components/visitedlink/renderer",
+  "+content/app/resources/grit",  # For generated headers
   "+content/app/strings/grit",  # For generated headers
   "+content/public/child",
   "+content/public/renderer",

chrome/renderer/pepper/pepper_pdf_host.cc

@@ -7,13 +7,13 @@
 #include "base/strings/utf_string_conversions.h"
 #include "chrome/common/render_messages.h"
 #include "chrome/renderer/printing/print_web_view_helper.h"
+#include "content/app/resources/grit/content_resources.h"
 #include "content/app/strings/grit/content_strings.h"
 #include "content/public/common/referrer.h"
 #include "content/public/renderer/pepper_plugin_instance.h"
 #include "content/public/renderer/render_thread.h"
 #include "content/public/renderer/render_view.h"
 #include "content/public/renderer/renderer_ppapi_host.h"
-#include "grit/webkit_resources.h"
 #include "ppapi/host/dispatch_host_message.h"
 #include "ppapi/host/host_message_context.h"
 #include "ppapi/host/ppapi_host.h"

chrome/renderer/pepper/ppb_pdf_impl.cc

@@ -11,13 +11,13 @@
 #include "build/build_config.h"
 #include "chrome/common/render_messages.h"
 #include "chrome/renderer/printing/print_web_view_helper.h"
+#include "content/app/resources/grit/content_resources.h"
 #include "content/app/strings/grit/content_strings.h"
 #include "content/public/common/child_process_sandbox_support_linux.h"
 #include "content/public/common/referrer.h"
 #include "content/public/renderer/pepper_plugin_instance.h"
 #include "content/public/renderer/render_thread.h"
 #include "content/public/renderer/render_view.h"
-#include "grit/webkit_resources.h"
 #include "ppapi/c/pp_resource.h"
 #include "ppapi/c/private/ppb_pdf.h"
 #include "ppapi/c/trusted/ppb_browser_font_trusted.h"

chromecast/chromecast.gyp

@@ -91,14 +91,14 @@
       'type': 'none',
       'dependencies': [
         'cast_shell_resources',
+        '../content/app/resources/content_resources.gyp:content_resources',
         '../content/app/strings/content_strings.gyp:content_strings',
         '../content/browser/devtools/devtools_resources.gyp:devtools_resources',
         '../content/content_resources.gyp:content_resources',
         '../net/net.gyp:net_resources',
         '../third_party/WebKit/public/blink_resources.gyp:blink_resources',
         '../ui/resources/ui_resources.gyp:ui_resources',
         '../ui/strings/ui_strings.gyp:ui_strings',
-        '../webkit/glue/resources/webkit_resources.gyp:webkit_resources',
       ],
       'actions': [
         {
@@ -108,14 +108,14 @@
               '<(SHARED_INTERMEDIATE_DIR)/blink/public/resources/blink_resources.pak',
               '<(SHARED_INTERMEDIATE_DIR)/chromecast/shell_resources.pak',
               '<(SHARED_INTERMEDIATE_DIR)/content/content_resources.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)/net/net_resources.pak',
               '<(SHARED_INTERMEDIATE_DIR)/ui/resources/ui_resources_100_percent.pak',
               '<(SHARED_INTERMEDIATE_DIR)/ui/resources/webui_resources.pak',
               '<(SHARED_INTERMEDIATE_DIR)/ui/strings/app_locale_settings_en-US.pak',
               '<(SHARED_INTERMEDIATE_DIR)/ui/strings/ui_strings_en-US.pak',
               '<(SHARED_INTERMEDIATE_DIR)/webkit/devtools_resources.pak',
-              '<(SHARED_INTERMEDIATE_DIR)/webkit/webkit_resources_100_percent.pak',
             ],
             'pak_output': '<(PRODUCT_DIR)/assets/cast_shell.pak',
           },

components/components_tests.gyp

@@ -866,6 +866,7 @@
             }],
             ['OS=="win"', {
               'resource_include_dirs': [
+                '<(SHARED_INTERMEDIATE_DIR)/content/app/resources',
                 '<(SHARED_INTERMEDIATE_DIR)/webkit',
               ],
               'sources': [
@@ -881,12 +882,12 @@
                 '<(SHARED_INTERMEDIATE_DIR)/net/net_resources.rc',
               ],
               'dependencies': [
+                '<(DEPTH)/content/app/resources/content_resources.gyp:content_resources',
                 '<(DEPTH)/content/app/strings/content_strings.gyp:content_strings',
                 '<(DEPTH)/net/net.gyp:net_resources',
                 '<(DEPTH)/third_party/WebKit/public/blink_resources.gyp:blink_resources',
                 '<(DEPTH)/third_party/iaccessible2/iaccessible2.gyp:iaccessible2',
                 '<(DEPTH)/third_party/isimpledom/isimpledom.gyp:isimpledom',
-                '<(DEPTH)/webkit/glue/resources/webkit_resources.gyp:webkit_resources',
               ],
               'configurations': {
                 'Debug_Base': {