Inline devtools_discovery_page_resources.grd into browser_resources.grd.

BUG=297672

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

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@251920 0039d316-1c4b-4281-b951-d872f2087c98

chrome/browser/android/dev_tools_server.cc

@@ -37,7 +37,7 @@
 #include "content/public/browser/web_contents_delegate.h"
 #include "content/public/common/content_switches.h"
 #include "content/public/common/url_constants.h"
-#include "grit/devtools_discovery_page_resources.h"
+#include "grit/browser_resources.h"
 #include "jni/DevToolsServer_jni.h"
 #include "net/socket/unix_domain_socket_posix.h"
 #include "net/url_request/url_request_context_getter.h"

chrome/browser/browser_resources.grd

@@ -123,6 +123,9 @@
       <include name="IDR_CRASHES_JS" file="resources\crashes.js" type="BINDATA" />
       <include name="IDR_CREDITS_HTML" file="${about_credits_file}" use_base_dir="false" type="BINDATA" />
       <include name="IDR_CREDITS_JS" file="resources\about_credits.js" type="BINDATA" />
+      <if expr="not is_ios">
+        <include name="IDR_DEVTOOLS_DISCOVERY_PAGE_HTML" file="devtools\frontend\devtools_discovery_page.html" type="BINDATA"/>
+      </if>
       <if expr="not is_android">
         <include name="IDR_DOWNLOADS_JS" file="resources\downloads\downloads.js" type="BINDATA" />
       </if>

chrome/browser/devtools/browser_list_tabcontents_provider.cc

@@ -19,7 +19,7 @@
 #include "chrome/common/chrome_paths.h"
 #include "content/public/browser/web_contents.h"
 #include "content/public/common/url_constants.h"
-#include "grit/devtools_discovery_page_resources.h"
+#include "grit/browser_resources.h"
 #include "net/socket/tcp_listen_socket.h"
 #include "net/url_request/url_request_context_getter.h"
 #include "ui/base/resource/resource_bundle.h"

chrome/browser/devtools/frontend/devtools_discovery_page_resources.grd

-<?xml version="1.0" encoding="UTF-8"?>
-<grit current_release="1" latest_public_release="0">
-  <outputs>
-    <output filename="grit/devtools_discovery_page_resources.h"
-            type="rc_header">
-      <emit emit_type="prepend"/>
-    </output>
-    <output filename="devtools_discovery_page_resources.pak"
-            type="data_package"/>
-  </outputs>
-  <release seq="1">
-    <includes>
-      <include file="devtools_discovery_page.html"
-               name="IDR_DEVTOOLS_DISCOVERY_PAGE_HTML"
-               type="BINDATA"/></includes>
-  </release>
-</grit>

chrome/chrome_resources.gyp

@@ -89,14 +89,6 @@
               },
               'includes': [ '../build/grit_action.gypi' ],
             },
-            {
-              'action_name': 'devtools_discovery_page_resources',
-              'variables': {
-                'grit_grd_file':
-                   'browser/devtools/frontend/devtools_discovery_page_resources.grd',
-              },
-              'includes': [ '../build/grit_action.gypi' ]
-            },
             {
               'action_name': 'sync_file_system_internals_resources',
               'variables': {

tools/gn/secondary/chrome/BUILD.gn

@@ -258,7 +258,6 @@ custom("about_credits") {
 #  if (!is_ios) {
 #    deps += [
 #      ":component_extension_resources",
-#      ":devtools_discovery_page_resources",
 #      ":options_resources",
 #      ":quota_internals_resources",
 #      ":sync_file_system_internals_resources",
@@ -268,9 +267,6 @@ custom("about_credits") {
 #grit("component_extension_resources") {
 #  source = "browser/resources/component_extension_resources.grd"
 #}
-#grit("devtools_discovery_page_resources") {
-#  source = "browser/devtools/frontend/devtools_discovery_page_resources.grd"
-#}
 #grit("memory_internals_resources") {
 #  source = "browser/resources/memory_internals_resources.grd"
 #}

tools/gritsettings/resource_ids

@@ -131,9 +131,6 @@
   "devtools_resources.grd": {
     "includes": [22000],
   },
-  "chrome/browser/devtools/frontend/devtools_discovery_page_resources.grd": {
-    "includes": [22500],
-  },
   "chrome/browser/resources/options_resources.grd": {
     "includes": [23000],
   },