Reland 274764 - Reland 274558 - Move some resources to extensions_renderer_resources.grd.

This patch fixes references in the .gyp to .js resource files (again).

This breaks the remaining dependency from src/extensions to chrome resources files.

BUG=368334
TBR=rockot@chromium.org,jam@chromium.org

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

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

41 files changed, 122 insertions, 82 deletions

diff --git a/apps/shell/app_shell.gyp b/apps/shell/app_shell.gyp
index fd1295e..bd5b26a 100644
--- a/apps/shell/app_shell.gyp
+++ b/apps/shell/app_shell.gyp
@@ -51,6 +51,7 @@
               '<(SHARED_INTERMEDIATE_DIR)/chrome/generated_resources_en-US.pak',
               '<(SHARED_INTERMEDIATE_DIR)/chrome/renderer_resources_100_percent.pak',
               '<(SHARED_INTERMEDIATE_DIR)/content/shell_resources.pak',
+              '<(SHARED_INTERMEDIATE_DIR)/extensions/extensions_renderer_resources.pak',
               '<(SHARED_INTERMEDIATE_DIR)/extensions/extensions_resources.pak',
               '<(SHARED_INTERMEDIATE_DIR)/extensions/strings/extensions_strings_en-US.pak',
               '<(SHARED_INTERMEDIATE_DIR)/ui/app_locale_settings/app_locale_settings_en-US.pak',
diff --git a/chrome/chrome_renderer.gypi b/chrome/chrome_renderer.gypi
index bbcd4b5..977fbb1 100644
--- a/chrome/chrome_renderer.gypi
+++ b/chrome/chrome_renderer.gypi
@@ -142,31 +142,22 @@
         'renderer/resources/extensions/app_custom_bindings.js',
         'renderer/resources/extensions/app_window_custom_bindings.js',
         'renderer/resources/extensions/automation_custom_bindings.js',
-        'renderer/resources/extensions/binding.js',
         'renderer/resources/extensions/browser_action_custom_bindings.js',
         'renderer/resources/extensions/chrome_direct_setting.js',
         'renderer/resources/extensions/chrome_setting.js',
         'renderer/resources/extensions/content_setting.js',
-        'renderer/resources/extensions/context_menus_custom_bindings.js',
         'renderer/resources/extensions/declarative_content_custom_bindings.js',
         'renderer/resources/extensions/declarative_webrequest_custom_bindings.js',
         'renderer/resources/extensions/enterprise_platform_keys_custom_bindings.js',
-        'renderer/resources/extensions/event.js',
-        'renderer/resources/extensions/extension_custom_bindings.js',
         'renderer/resources/extensions/feedback_private_custom_bindings.js',
         'renderer/resources/extensions/file_browser_handler_custom_bindings.js',
         'renderer/resources/extensions/file_browser_private_custom_bindings.js',
         'renderer/resources/extensions/file_system_custom_bindings.js',
         'renderer/resources/extensions/file_system_provider_custom_bindings.js',
         'renderer/resources/extensions/gcm_custom_bindings.js',
-        'renderer/resources/extensions/greasemonkey_api.js',
         'renderer/resources/extensions/identity_custom_bindings.js',
         'renderer/resources/extensions/image_writer_private_custom_bindings.js',
         'renderer/resources/extensions/input.ime_custom_bindings.js',
-        'renderer/resources/extensions/json_schema.js',
-        'renderer/resources/extensions/last_error.js',
-        'renderer/resources/extensions/messaging.js',
-        'renderer/resources/extensions/messaging_utils.js',
         'renderer/resources/extensions/notifications_custom_bindings.js',
         'renderer/resources/extensions/omnibox_custom_bindings.js',
         'renderer/resources/extensions/page_action_custom_bindings.js',
@@ -174,17 +165,9 @@
         'renderer/resources/extensions/page_capture_custom_bindings.js',
         'renderer/resources/extensions/platform_app.js',
         'renderer/resources/extensions/pepper_request.js',
-        'renderer/resources/extensions/runtime_custom_bindings.js',
-        'renderer/resources/extensions/send_request.js',
-        'renderer/resources/extensions/set_icon.js',
-        'renderer/resources/extensions/storage_area.js',
         'renderer/resources/extensions/system_indicator_custom_bindings.js',
-        'renderer/resources/extensions/test_custom_bindings.js',
         'renderer/resources/extensions/tts_custom_bindings.js',
         'renderer/resources/extensions/tts_engine_custom_bindings.js',
-        'renderer/resources/extensions/uncaught_exception_handler.js',
-        'renderer/resources/extensions/unload_event.js',
-        'renderer/resources/extensions/utils.js',
         'renderer/resources/extensions/web_request_custom_bindings.js',
         'renderer/resources/extensions/web_view.js',
         'renderer/resources/extensions/web_view_experimental.js',
diff --git a/chrome/chrome_repack_resources.gypi b/chrome/chrome_repack_resources.gypi
index 219d72f..10f124d 100644
--- a/chrome/chrome_repack_resources.gypi
+++ b/chrome/chrome_repack_resources.gypi
@@ -30,6 +30,7 @@
         'pak_inputs': [
           '<(SHARED_INTERMEDIATE_DIR)/content/browser/tracing/tracing_resources.pak',
           '<(SHARED_INTERMEDIATE_DIR)/content/content_resources.pak',
+          '<(SHARED_INTERMEDIATE_DIR)/extensions/extensions_renderer_resources.pak', 
           '<(SHARED_INTERMEDIATE_DIR)/extensions/extensions_resources.pak',
           '<(SHARED_INTERMEDIATE_DIR)/webkit/blink_resources.pak',
         ],
diff --git a/chrome/chrome_tests_unit.gypi b/chrome/chrome_tests_unit.gypi
index aadac71..21a09fb 100644
--- a/chrome/chrome_tests_unit.gypi
+++ b/chrome/chrome_tests_unit.gypi
@@ -2022,6 +2022,7 @@
             '../components/components.gyp:data_reduction_proxy_test_support',
             '../components/components_strings.gyp:components_strings',
             '../device/bluetooth/bluetooth.gyp:device_bluetooth_mocks',
+            '../extensions/extensions_resources.gyp:extensions_resources',
             '../extensions/extensions_strings.gyp:extensions_strings',
             '../gpu/gpu.gyp:gpu_unittest_utils',
             '../media/media.gyp:media_test_support',
diff --git a/chrome/renderer/extensions/event_unittest.cc b/chrome/renderer/extensions/event_unittest.cc
index b767363..1abc55e 100644
--- a/chrome/renderer/extensions/event_unittest.cc
+++ b/chrome/renderer/extensions/event_unittest.cc
@@ -5,7 +5,7 @@
 #include "chrome/test/base/module_system_test.h"
 
 #include "extensions/common/extension_urls.h"
-#include "grit/renderer_resources.h"
+#include "grit/extensions_renderer_resources.h"
 
 namespace extensions {
 namespace {
diff --git a/chrome/renderer/extensions/json_schema_unittest.cc b/chrome/renderer/extensions/json_schema_unittest.cc
index 858b135..aabd91c 100644
--- a/chrome/renderer/extensions/json_schema_unittest.cc
+++ b/chrome/renderer/extensions/json_schema_unittest.cc
@@ -4,7 +4,7 @@
 
 #include "chrome/test/base/module_system_test.h"
 #include "extensions/renderer/v8_schema_registry.h"
-#include "grit/renderer_resources.h"
+#include "grit/extensions_renderer_resources.h"
 
 namespace extensions {
 
diff --git a/chrome/renderer/extensions/messaging_utils_unittest.cc b/chrome/renderer/extensions/messaging_utils_unittest.cc
index 6f92389..4a53bbd 100644
--- a/chrome/renderer/extensions/messaging_utils_unittest.cc
+++ b/chrome/renderer/extensions/messaging_utils_unittest.cc
@@ -4,7 +4,7 @@
 
 #include "base/strings/stringprintf.h"
 #include "chrome/test/base/module_system_test.h"
-#include "grit/renderer_resources.h"
+#include "grit/extensions_renderer_resources.h"
 
 namespace extensions {
 namespace {
diff --git a/chrome/renderer/extensions/safe_builtins_unittest.cc b/chrome/renderer/extensions/safe_builtins_unittest.cc
index 70c93ae..acf8194 100644
--- a/chrome/renderer/extensions/safe_builtins_unittest.cc
+++ b/chrome/renderer/extensions/safe_builtins_unittest.cc
@@ -4,8 +4,6 @@
 
 #include "chrome/test/base/module_system_test.h"
 
-#include "grit/renderer_resources.h"
-
 namespace extensions {
 namespace {
 
diff --git a/chrome/renderer/resources/renderer_resources.grd b/chrome/renderer/resources/renderer_resources.grd
index 8d545cb..a419012 100644
--- a/chrome/renderer/resources/renderer_resources.grd
+++ b/chrome/renderer/resources/renderer_resources.grd
@@ -1,6 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- This comment is only here because changes to resources are not picked up
-without changes to the corresponding grd file. fb9 -->
 <grit latest_public_release="0" current_release="1">
   <outputs>
     <output filename="grit/renderer_resources.h" type="rc_header" context="default_100_percent">
@@ -35,13 +33,11 @@ without changes to the corresponding grd file. fb9 -->
         <include name="IDR_AD_VIEW_DENY_JS" file="extensions\ad_view_deny.js" type="BINDATA" />
         <include name="IDR_AD_VIEW_JS" file="extensions\ad_view.js" type="BINDATA" />
         <include name="IDR_APP_CUSTOM_BINDINGS_JS" file="extensions\app_custom_bindings.js" type="BINDATA" />
-        <include name="IDR_APP_RUNTIME_CUSTOM_BINDINGS_JS" file="extensions\app_runtime_custom_bindings.js" type="BINDATA" />
         <include name="IDR_APP_WINDOW_CUSTOM_BINDINGS_JS" file="extensions\app_window_custom_bindings.js" type="BINDATA" />
         <include name="IDR_AUTOMATION_CUSTOM_BINDINGS_JS" file="extensions\automation_custom_bindings.js" type="BINDATA" />
         <include name="IDR_AUTOMATION_EVENT_JS" file="extensions\automation\automation_event.js" type="BINDATA" />
         <include name="IDR_AUTOMATION_NODE_JS" file="extensions\automation\automation_node.js" type="BINDATA" />
         <include name="IDR_AUTOMATION_TREE_JS" file="extensions\automation\automation_tree.js" type="BINDATA" />
-        <include name="IDR_BINDING_JS" file="extensions\binding.js" type="BINDATA" />
         <include name="IDR_BROWSER_ACTION_CUSTOM_BINDINGS_JS" file="extensions\browser_action_custom_bindings.js" type="BINDATA" />
         <include name="IDR_CAST_STREAMING_RTP_STREAM_CUSTOM_BINDINGS_JS" file="extensions\cast_streaming_rtp_stream_custom_bindings.js" type="BINDATA" />
         <include name="IDR_CAST_STREAMING_SESSION_CUSTOM_BINDINGS_JS" file="extensions\cast_streaming_session_custom_bindings.js" type="BINDATA" />
@@ -50,7 +46,6 @@ without changes to the corresponding grd file. fb9 -->
         file="extensions\chrome_direct_setting.js" type="BINDATA" />
         <include name="IDR_CHROME_SETTING_JS" file="extensions\chrome_setting.js" type="BINDATA" />
         <include name="IDR_CONTENT_SETTING_JS" file="extensions\content_setting.js" type="BINDATA" />
-        <include name="IDR_CONTEXT_MENUS_CUSTOM_BINDINGS_JS" file="extensions\context_menus_custom_bindings.js" type="BINDATA" />
         <include name="IDR_DECLARATIVE_CONTENT_CUSTOM_BINDINGS_JS" file="extensions\declarative_content_custom_bindings.js" type="BINDATA" />
         <include name="IDR_DECLARATIVE_WEBREQUEST_CUSTOM_BINDINGS_JS" file="extensions\declarative_webrequest_custom_bindings.js" type="BINDATA" />
         <include name="IDR_DESKTOP_CAPTURE_CUSTOM_BINDINGS_JS" file="extensions\desktop_capture_custom_bindings.js" type="BINDATA" />
@@ -63,49 +58,29 @@ without changes to the corresponding grd file. fb9 -->
         <include name="IDR_ENTERPRISE_PLATFORM_KEYS_SUBTLE_CRYPTO_JS" file="extensions\enterprise_platform_keys\subtle_crypto.js" type="BINDATA" />
         <include name="IDR_ENTERPRISE_PLATFORM_KEYS_TOKEN_JS" file="extensions\enterprise_platform_keys\token.js" type="BINDATA" />
         <include name="IDR_ENTERPRISE_PLATFORM_KEYS_UTILS_JS" file="extensions\enterprise_platform_keys\utils.js" type="BINDATA" />
-        <include name="IDR_ENTRY_ID_MANAGER" file="extensions\entry_id_manager.js" type="BINDATA" />
-        <include name="IDR_EVENT_BINDINGS_JS" file="extensions\event.js" type="BINDATA" />
-        <include name="IDR_EXTENSION_CUSTOM_BINDINGS_JS" file="extensions\extension_custom_bindings.js" type="BINDATA" />
         <include name="IDR_FEEDBACK_PRIVATE_CUSTOM_BINDINGS_JS" file="extensions\feedback_private_custom_bindings.js" type="BINDATA" />
         <include name="IDR_FILE_BROWSER_HANDLER_CUSTOM_BINDINGS_JS" file="extensions\file_browser_handler_custom_bindings.js" type="BINDATA" />
         <include name="IDR_FILE_BROWSER_PRIVATE_CUSTOM_BINDINGS_JS" file="extensions\file_browser_private_custom_bindings.js" type="BINDATA" />
         <include name="IDR_FILE_SYSTEM_CUSTOM_BINDINGS_JS" file="extensions\file_system_custom_bindings.js" type="BINDATA" />
         <include name="IDR_FILE_SYSTEM_PROVIDER_CUSTOM_BINDINGS_JS" file="extensions\file_system_provider_custom_bindings.js" type="BINDATA" />
         <include name="IDR_GCM_CUSTOM_BINDINGS_JS" file="extensions\gcm_custom_bindings.js" type="BINDATA" />
-        <include name="IDR_GREASEMONKEY_API_JS" file="extensions\greasemonkey_api.js" type="BINDATA" />
-        <include name="IDR_I18N_CUSTOM_BINDINGS_JS" file="extensions\i18n_custom_bindings.js" type="BINDATA" />
         <include name="IDR_IDENTITY_CUSTOM_BINDINGS_JS" file="extensions\identity_custom_bindings.js" type="BINDATA" />
-        <include name="IDR_IMAGE_UTIL_JS" file="extensions\image_util.js" type="BINDATA" />
         <include name="IDR_IMAGE_WRITER_PRIVATE_CUSTOM_BINDINGS_JS" file="extensions\image_writer_private_custom_bindings.js" type="BINDATA" />
         <include name="IDR_INPUT_IME_CUSTOM_BINDINGS_JS" file="extensions\input.ime_custom_bindings.js" type="BINDATA" />
-        <include name="IDR_JSON_SCHEMA_JS" file="extensions\json_schema.js" type="BINDATA" />
-        <include name="IDR_LAST_ERROR_JS" file="extensions\last_error.js" type="BINDATA" />
         <include name="IDR_MEDIA_GALLERIES_CUSTOM_BINDINGS_JS" file="extensions\media_galleries_custom_bindings.js" type="BINDATA" />
-        <include name="IDR_MESSAGING_JS" file="extensions\messaging.js" type="BINDATA" />
-        <include name="IDR_MESSAGING_UTILS_JS" file="extensions\messaging_utils.js" type="BINDATA" />
         <include name="IDR_NOTIFICATIONS_CUSTOM_BINDINGS_JS" file="extensions\notifications_custom_bindings.js" type="BINDATA" />
         <include name="IDR_OMNIBOX_CUSTOM_BINDINGS_JS" file="extensions\omnibox_custom_bindings.js" type="BINDATA" />
         <include name="IDR_PAGE_ACTIONS_CUSTOM_BINDINGS_JS" file="extensions\page_actions_custom_bindings.js" type="BINDATA" />
         <include name="IDR_PAGE_ACTION_CUSTOM_BINDINGS_JS" file="extensions\page_action_custom_bindings.js" type="BINDATA" />
         <include name="IDR_PAGE_CAPTURE_CUSTOM_BINDINGS_JS" file="extensions\page_capture_custom_bindings.js" type="BINDATA" />
         <include name="IDR_PEPPER_REQUEST_JS" file="extensions\pepper_request.js" type="BINDATA" />
-        <include name="IDR_PERMISSIONS_CUSTOM_BINDINGS_JS" file="extensions\permissions_custom_bindings.js" type="BINDATA" />
-        <include name="IDR_RUNTIME_CUSTOM_BINDINGS_JS" file="extensions\runtime_custom_bindings.js" type="BINDATA" />
-        <include name="IDR_SCHEMA_UTILS_JS" file="extensions\schema_utils.js" type="BINDATA" />
-        <include name="IDR_SEND_REQUEST_JS" file="extensions\send_request.js" type="BINDATA" />
-        <include name="IDR_SET_ICON_JS" file="extensions\set_icon.js" type="BINDATA" />
-        <include name="IDR_STORAGE_AREA_JS" file="extensions\storage_area.js" type="BINDATA" />
         <include name="IDR_SYNC_FILE_SYSTEM_CUSTOM_BINDINGS_JS" file="extensions\sync_file_system_custom_bindings.js" type="BINDATA" />
         <include name="IDR_SYSTEM_INDICATOR_CUSTOM_BINDINGS_JS" file="extensions\system_indicator_custom_bindings.js" type="BINDATA" />
         <include name="IDR_TAB_CAPTURE_CUSTOM_BINDINGS_JS" file="extensions\tab_capture_custom_bindings.js" type="BINDATA" />
         <include name="IDR_TABS_CUSTOM_BINDINGS_JS" file="extensions\tabs_custom_bindings.js" type="BINDATA" />
         <include name="IDR_TAG_WATCHER_JS" file="extensions\tag_watcher.js" type="BINDATA" />
-        <include name="IDR_TEST_CUSTOM_BINDINGS_JS" file="extensions\test_custom_bindings.js" type="BINDATA" />
         <include name="IDR_TTS_CUSTOM_BINDINGS_JS" file="extensions\tts_custom_bindings.js" type="BINDATA" />
         <include name="IDR_TTS_ENGINE_CUSTOM_BINDINGS_JS" file="extensions\tts_engine_custom_bindings.js" type="BINDATA" />
-        <include name="IDR_UNCAUGHT_EXCEPTION_HANDLER_JS" file="extensions\uncaught_exception_handler.js" type="BINDATA" />
-        <include name="IDR_UNLOAD_EVENT_JS" file="extensions\unload_event.js" type="BINDATA" />
-        <include name="IDR_UTILS_JS" file="extensions\utils.js" type="BINDATA" />
         <include name="IDR_WINDOW_CONTROLS_JS" file="extensions\window_controls.js" type="BINDATA" />
         <include name="IDR_WINDOW_CONTROLS_TEMPLATE_HTML" file="extensions\window_controls_template.html" type="BINDATA" />
         <include name="IDR_WEB_REQUEST_CUSTOM_BINDINGS_JS" file="extensions\web_request_custom_bindings.js" type="BINDATA" />
@@ -118,8 +93,6 @@ without changes to the corresponding grd file. fb9 -->
         <include name="IDR_WEB_VIEW_REQUEST_CUSTOM_BINDINGS_JS" file="extensions\webview_request_custom_bindings.js" type="BINDATA" />
 
         <!-- Platform app support. -->
-        <include name="IDR_PLATFORM_APP_CSS" file="extensions\platform_app.css" type="BINDATA" />
-        <include name="IDR_PLATFORM_APP_JS" file="extensions\platform_app.js" type="BINDATA" />
         <include name="IDR_INJECT_APP_TITLEBAR_JS" file="extensions\inject_app_titlebar.js" type="BINDATA" />
       </if>
     </includes>
diff --git a/extensions/DEPS b/extensions/DEPS
index f919975..d762dc4 100644
--- a/extensions/DEPS
+++ b/extensions/DEPS
@@ -2,6 +2,7 @@ include_rules = [
   "+components/url_matcher",
   "+content/public/common",
   "+crypto",
+  "+grit/extensions_renderer_resources.h",
   "+grit/extensions_resources.h",
   "+testing",
   "+ui",
@@ -13,9 +14,6 @@ include_rules = [
   #
   # TODO(jamescook): Remove these. http://crbug.com/162530
   "!chrome/browser/chrome_notification_types.h",
-  # This is needed for renderer JS sources which should eventually move to
-  # the extensions_resources target.
-  "!grit/renderer_resources.h",
 ]
 
 specific_include_rules = {
diff --git a/extensions/extensions.gyp b/extensions/extensions.gyp
index e00b987..2d6c3ca 100644
--- a/extensions/extensions.gyp
+++ b/extensions/extensions.gyp
@@ -526,6 +526,31 @@
         'renderer/request_sender.h',
         'renderer/resource_bundle_source_map.cc',
         'renderer/resource_bundle_source_map.h',
+        'renderer/resources/app_runtime_custom_bindings.js',
+        'renderer/resources/binding.js',
+        'renderer/resources/context_menus_custom_bindings.js',
+        'renderer/resources/entry_id_manager.js',
+        'renderer/resources/event.js',
+        'renderer/resources/extension_custom_bindings.js',
+        'renderer/resources/greasemonkey_api.js',
+        'renderer/resources/i18n_custom_bindings.js',
+        'renderer/resources/image_util.js',
+        'renderer/resources/json_schema.js',
+        'renderer/resources/last_error.js',
+        'renderer/resources/messaging.js',
+        'renderer/resources/messaging_utils.js',
+        'renderer/resources/permissions_custom_bindings.js',
+        'renderer/resources/platform_app.css',
+        'renderer/resources/platform_app.js',
+        'renderer/resources/runtime_custom_bindings.js',
+        'renderer/resources/schema_utils.js',
+        'renderer/resources/send_request.js',
+        'renderer/resources/set_icon.js',
+        'renderer/resources/storage_area.js',
+        'renderer/resources/test_custom_bindings.js',
+        'renderer/resources/uncaught_exception_handler.js',
+        'renderer/resources/unload_event.js',
+        'renderer/resources/utils.js',
         'renderer/runtime_custom_bindings.cc',
         'renderer/runtime_custom_bindings.h',
         'renderer/safe_builtins.cc',
diff --git a/extensions/extensions_resources.gyp b/extensions/extensions_resources.gyp
index 856def8..dd0e1cd 100644
--- a/extensions/extensions_resources.gyp
+++ b/extensions/extensions_resources.gyp
@@ -18,8 +18,20 @@
           },
           'includes': [ '../build/grit_action.gypi' ],
         },
+        {
+          'action_name': 'extensions_renderer_resources',
+          'variables': {
+            'grit_grd_file': 'renderer/resources/extensions_renderer_resources.grd',
+          },
+          'includes': [ '../build/grit_action.gypi' ],
+        },
       ],
       'includes': [ '../build/grit_target.gypi' ],
+      'direct_dependent_settings': {
+        'include_dirs': [
+          '<(SHARED_INTERMEDIATE_DIR)/extensions',
+        ]
+      },
       'hard_dependency': 1,
     }
   ]
diff --git a/extensions/renderer/dispatcher.cc b/extensions/renderer/dispatcher.cc
index 0d11726..dde54db 100644
--- a/extensions/renderer/dispatcher.cc
+++ b/extensions/renderer/dispatcher.cc
@@ -73,7 +73,7 @@
 #include "extensions/renderer/user_script_slave.h"
 #include "extensions/renderer/utils_native_handler.h"
 #include "extensions/renderer/v8_context_native_handler.h"
-#include "grit/renderer_resources.h"
+#include "grit/extensions_renderer_resources.h"
 #include "third_party/WebKit/public/platform/WebString.h"
 #include "third_party/WebKit/public/platform/WebURLRequest.h"
 #include "third_party/WebKit/public/web/WebCustomElement.h"
diff --git a/chrome/renderer/resources/extensions/app_runtime_custom_bindings.js b/extensions/renderer/resources/app_runtime_custom_bindings.js
index d51352f..f4fe24d 100644
--- a/chrome/renderer/resources/extensions/app_runtime_custom_bindings.js
+++ b/extensions/renderer/resources/app_runtime_custom_bindings.js
@@ -1,4 +1,4 @@
-// Copyright (c) 2012 The Chromium Authors. All rights reserved.
+// 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.
 
diff --git a/chrome/renderer/resources/extensions/binding.js b/extensions/renderer/resources/binding.js
index 4bb9b99..b0c6afa 100644
--- a/chrome/renderer/resources/extensions/binding.js
+++ b/extensions/renderer/resources/binding.js
@@ -1,4 +1,4 @@
-// Copyright (c) 2012 The Chromium Authors. All rights reserved.
+// 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.
 
diff --git a/chrome/renderer/resources/extensions/context_menus_custom_bindings.js b/extensions/renderer/resources/context_menus_custom_bindings.js
index 5323f73..71a97a4 100644
--- a/chrome/renderer/resources/extensions/context_menus_custom_bindings.js
+++ b/extensions/renderer/resources/context_menus_custom_bindings.js
@@ -1,4 +1,4 @@
-// Copyright (c) 2012 The Chromium Authors. All rights reserved.
+// 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.
 
diff --git a/chrome/renderer/resources/extensions/entry_id_manager.js b/extensions/renderer/resources/entry_id_manager.js
index 669e7bf..9fc2c14 100644
--- a/chrome/renderer/resources/extensions/entry_id_manager.js
+++ b/extensions/renderer/resources/entry_id_manager.js
@@ -1,4 +1,4 @@
-// Copyright (c) 2013 The Chromium Authors. All rights reserved.
+// 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.
 
diff --git a/chrome/renderer/resources/extensions/event.js b/extensions/renderer/resources/event.js
index 74f3ee06..d82b9fb 100644
--- a/chrome/renderer/resources/extensions/event.js
+++ b/extensions/renderer/resources/event.js
@@ -1,4 +1,4 @@
-// Copyright (c) 2012 The Chromium Authors. All rights reserved.
+// 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.
 
diff --git a/chrome/renderer/resources/extensions/extension_custom_bindings.js b/extensions/renderer/resources/extension_custom_bindings.js
index b28fabd..d114f52 100644
--- a/chrome/renderer/resources/extensions/extension_custom_bindings.js
+++ b/extensions/renderer/resources/extension_custom_bindings.js
@@ -1,4 +1,4 @@
-// Copyright (c) 2012 The Chromium Authors. All rights reserved.
+// 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.
 
diff --git a/extensions/renderer/resources/extensions_renderer_resources.grd b/extensions/renderer/resources/extensions_renderer_resources.grd
new file mode 100644
index 0000000..4cf03e4b
--- /dev/null
+++ b/extensions/renderer/resources/extensions_renderer_resources.grd
@@ -0,0 +1,45 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<grit latest_public_release="0" current_release="1">
+  <outputs>
+    <output filename="grit/extensions_renderer_resources.h" type="rc_header">
+      <emit emit_type='prepend'></emit>
+    </output>
+    <output filename="extensions_renderer_resources.pak" type="data_package" />
+  </outputs>
+  <release seq="1">
+    <includes>
+      <!-- Extension libraries. -->
+      <include name="IDR_ENTRY_ID_MANAGER" file="entry_id_manager.js" type="BINDATA" />
+      <include name="IDR_EVENT_BINDINGS_JS" file="event.js" type="BINDATA" />
+      <include name="IDR_IMAGE_UTIL_JS" file="image_util.js" type="BINDATA" />
+      <include name="IDR_JSON_SCHEMA_JS" file="json_schema.js" type="BINDATA" />
+      <include name="IDR_LAST_ERROR_JS" file="last_error.js" type="BINDATA" />
+      <include name="IDR_MESSAGING_JS" file="messaging.js" type="BINDATA" />
+      <include name="IDR_MESSAGING_UTILS_JS" file="messaging_utils.js" type="BINDATA" />
+      <include name="IDR_SCHEMA_UTILS_JS" file="schema_utils.js" type="BINDATA" />
+      <include name="IDR_SEND_REQUEST_JS" file="send_request.js" type="BINDATA" />
+      <include name="IDR_SET_ICON_JS" file="set_icon.js" type="BINDATA" />
+      <include name="IDR_TEST_CUSTOM_BINDINGS_JS" file="test_custom_bindings.js" type="BINDATA" />
+      <include name="IDR_UNCAUGHT_EXCEPTION_HANDLER_JS" file="uncaught_exception_handler.js" type="BINDATA" />
+      <include name="IDR_UNLOAD_EVENT_JS" file="unload_event.js" type="BINDATA" />
+      <include name="IDR_UTILS_JS" file="utils.js" type="BINDATA" />
+
+      <!-- Custom bindings for APIs. -->
+      <include name="IDR_APP_RUNTIME_CUSTOM_BINDINGS_JS" file="app_runtime_custom_bindings.js" type="BINDATA" />
+      <include name="IDR_CONTEXT_MENUS_CUSTOM_BINDINGS_JS" file="context_menus_custom_bindings.js" type="BINDATA" />
+      <include name="IDR_EXTENSION_CUSTOM_BINDINGS_JS" file="extension_custom_bindings.js" type="BINDATA" />
+      <include name="IDR_GREASEMONKEY_API_JS" file="greasemonkey_api.js" type="BINDATA" />
+      <include name="IDR_I18N_CUSTOM_BINDINGS_JS" file="i18n_custom_bindings.js" type="BINDATA" />
+      <include name="IDR_PERMISSIONS_CUSTOM_BINDINGS_JS" file="permissions_custom_bindings.js" type="BINDATA" />
+      <include name="IDR_RUNTIME_CUSTOM_BINDINGS_JS" file="runtime_custom_bindings.js" type="BINDATA" />
+      <include name="IDR_BINDING_JS" file="binding.js" type="BINDATA" />
+
+      <!-- Custom types for APIs. -->
+      <include name="IDR_STORAGE_AREA_JS" file="storage_area.js" type="BINDATA" />
+
+      <!-- Platform app support. -->
+      <include name="IDR_PLATFORM_APP_CSS" file="platform_app.css" type="BINDATA" />
+      <include name="IDR_PLATFORM_APP_JS" file="platform_app.js" type="BINDATA" />
+    </includes>
+  </release>
+</grit>
diff --git a/chrome/renderer/resources/extensions/greasemonkey_api.js b/extensions/renderer/resources/greasemonkey_api.js
index b1970f7..bc09911 100644
--- a/chrome/renderer/resources/extensions/greasemonkey_api.js
+++ b/extensions/renderer/resources/greasemonkey_api.js
@@ -1,4 +1,4 @@
-// Copyright (c) 2009 The Chromium Authors. All rights reserved.
+// 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.
 
diff --git a/chrome/renderer/resources/extensions/i18n_custom_bindings.js b/extensions/renderer/resources/i18n_custom_bindings.js
index 5bdd494..38570f3 100644
--- a/chrome/renderer/resources/extensions/i18n_custom_bindings.js
+++ b/extensions/renderer/resources/i18n_custom_bindings.js
@@ -1,4 +1,4 @@
-// Copyright (c) 2012 The Chromium Authors. All rights reserved.
+// 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.
 
diff --git a/chrome/renderer/resources/extensions/image_util.js b/extensions/renderer/resources/image_util.js
index 7986740..b6cd1b1 100644
--- a/chrome/renderer/resources/extensions/image_util.js
+++ b/extensions/renderer/resources/image_util.js
@@ -1,4 +1,4 @@
-// Copyright 2013 The Chromium Authors. All rights reserved.
+// 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.
 
diff --git a/chrome/renderer/resources/extensions/json_schema.js b/extensions/renderer/resources/json_schema.js
index f2478f9..67c30c9 100644
--- a/chrome/renderer/resources/extensions/json_schema.js
+++ b/extensions/renderer/resources/json_schema.js
@@ -1,10 +1,10 @@
-// Copyright (c) 2012 The Chromium Authors. All rights reserved.
+// 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.
 
 // -----------------------------------------------------------------------------
-// NOTE: If you change this file you need to touch renderer_resources.grd to
-// have your change take effect.
+// NOTE: If you change this file you need to touch
+// extension_renderer_resources.grd to have your change take effect.
 // -----------------------------------------------------------------------------
 
 //==============================================================================
diff --git a/chrome/renderer/resources/extensions/last_error.js b/extensions/renderer/resources/last_error.js
index b096aa4..8d53371 100644
--- a/chrome/renderer/resources/extensions/last_error.js
+++ b/extensions/renderer/resources/last_error.js
@@ -1,4 +1,4 @@
-// Copyright (c) 2012 The Chromium Authors. All rights reserved.
+// 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.
 
diff --git a/chrome/renderer/resources/extensions/messaging.js b/extensions/renderer/resources/messaging.js
index aea77cb..c7a45de 100644
--- a/chrome/renderer/resources/extensions/messaging.js
+++ b/extensions/renderer/resources/messaging.js
@@ -1,4 +1,4 @@
-// Copyright (c) 2012 The Chromium Authors. All rights reserved.
+// 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.
 
diff --git a/chrome/renderer/resources/extensions/messaging_utils.js b/extensions/renderer/resources/messaging_utils.js
index dd0fc28..d1b563d 100644
--- a/chrome/renderer/resources/extensions/messaging_utils.js
+++ b/extensions/renderer/resources/messaging_utils.js
@@ -1,4 +1,4 @@
-// Copyright 2013 The Chromium Authors. All rights reserved.
+// 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.
 
diff --git a/chrome/renderer/resources/extensions/permissions_custom_bindings.js b/extensions/renderer/resources/permissions_custom_bindings.js
index f702dc0..60edfaa 100644
--- a/chrome/renderer/resources/extensions/permissions_custom_bindings.js
+++ b/extensions/renderer/resources/permissions_custom_bindings.js
@@ -1,4 +1,4 @@
-// Copyright (c) 2012 The Chromium Authors. All rights reserved.
+// 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.
 
diff --git a/chrome/renderer/resources/extensions/platform_app.css b/extensions/renderer/resources/platform_app.css
index c16891d..eb241de 100644
--- a/chrome/renderer/resources/extensions/platform_app.css
+++ b/extensions/renderer/resources/platform_app.css
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012 The Chromium Authors. All rights reserved.
+ * 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.
  *
diff --git a/chrome/renderer/resources/extensions/platform_app.js b/extensions/renderer/resources/platform_app.js
index f6934cf..16470a5 100644
--- a/chrome/renderer/resources/extensions/platform_app.js
+++ b/extensions/renderer/resources/platform_app.js
@@ -1,4 +1,4 @@
-// Copyright (c) 2012 The Chromium Authors. All rights reserved.
+// 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.
 
diff --git a/chrome/renderer/resources/extensions/runtime_custom_bindings.js b/extensions/renderer/resources/runtime_custom_bindings.js
index add47cc..88f4f5e 100644
--- a/chrome/renderer/resources/extensions/runtime_custom_bindings.js
+++ b/extensions/renderer/resources/runtime_custom_bindings.js
@@ -1,4 +1,4 @@
-// Copyright (c) 2012 The Chromium Authors. All rights reserved.
+// 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.
 
diff --git a/chrome/renderer/resources/extensions/schema_utils.js b/extensions/renderer/resources/schema_utils.js
index d54fbe2..c0cb777 100644
--- a/chrome/renderer/resources/extensions/schema_utils.js
+++ b/extensions/renderer/resources/schema_utils.js
@@ -1,4 +1,4 @@
-// Copyright (c) 2012 The Chromium Authors. All rights reserved.
+// 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.
 
diff --git a/chrome/renderer/resources/extensions/send_request.js b/extensions/renderer/resources/send_request.js
index 808c6cd..8402843 100644
--- a/chrome/renderer/resources/extensions/send_request.js
+++ b/extensions/renderer/resources/send_request.js
@@ -1,4 +1,4 @@
-// Copyright (c) 2012 The Chromium Authors. All rights reserved.
+// 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.
 
diff --git a/chrome/renderer/resources/extensions/set_icon.js b/extensions/renderer/resources/set_icon.js
index dde9274..883fd67 100644
--- a/chrome/renderer/resources/extensions/set_icon.js
+++ b/extensions/renderer/resources/set_icon.js
@@ -1,4 +1,4 @@
-// Copyright (c) 2012 The Chromium Authors. All rights reserved.
+// 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.
 
diff --git a/chrome/renderer/resources/extensions/storage_area.js b/extensions/renderer/resources/storage_area.js
index 66d57d4..de737ab 100644
--- a/chrome/renderer/resources/extensions/storage_area.js
+++ b/extensions/renderer/resources/storage_area.js
@@ -1,4 +1,4 @@
-// Copyright (c) 2012 The Chromium Authors. All rights reserved.
+// 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.
 
diff --git a/chrome/renderer/resources/extensions/test_custom_bindings.js b/extensions/renderer/resources/test_custom_bindings.js
index 3c5c89c..6e94b0c 100644
--- a/chrome/renderer/resources/extensions/test_custom_bindings.js
+++ b/extensions/renderer/resources/test_custom_bindings.js
@@ -1,4 +1,4 @@
-// Copyright (c) 2012 The Chromium Authors. All rights reserved.
+// 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.
 
diff --git a/chrome/renderer/resources/extensions/uncaught_exception_handler.js b/extensions/renderer/resources/uncaught_exception_handler.js
index a3709b5..a3709b5 100644
--- a/chrome/renderer/resources/extensions/uncaught_exception_handler.js
+++ b/extensions/renderer/resources/uncaught_exception_handler.js
diff --git a/chrome/renderer/resources/extensions/unload_event.js b/extensions/renderer/resources/unload_event.js
index 52cf889..753c2f0 100644
--- a/chrome/renderer/resources/extensions/unload_event.js
+++ b/extensions/renderer/resources/unload_event.js
@@ -1,4 +1,4 @@
-// Copyright 2013 The Chromium Authors. All rights reserved.
+// 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.
 
diff --git a/chrome/renderer/resources/extensions/utils.js b/extensions/renderer/resources/utils.js
index 4378e3c..dd1ec2a 100644
--- a/chrome/renderer/resources/extensions/utils.js
+++ b/extensions/renderer/resources/utils.js
@@ -1,4 +1,4 @@
-// Copyright (c) 2012 The Chromium Authors. All rights reserved.
+// 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.
 
diff --git a/extensions/renderer/script_injection.cc b/extensions/renderer/script_injection.cc
index d3113cd..036dfc7 100644
--- a/extensions/renderer/script_injection.cc
+++ b/extensions/renderer/script_injection.cc
@@ -19,7 +19,7 @@
 #include "extensions/renderer/extension_helper.h"
 #include "extensions/renderer/script_context.h"
 #include "extensions/renderer/user_script_slave.h"
-#include "grit/renderer_resources.h"
+#include "grit/extensions_renderer_resources.h"
 #include "third_party/WebKit/public/web/WebDocument.h"
 #include "third_party/WebKit/public/web/WebFrame.h"
 #include "third_party/WebKit/public/web/WebScriptSource.h"
diff --git a/tools/gritsettings/resource_ids b/tools/gritsettings/resource_ids
index 45eb5a4..21d8a69 100644
--- a/tools/gritsettings/resource_ids
+++ b/tools/gritsettings/resource_ids
@@ -163,10 +163,13 @@
     "messages": [26000],
   },
   "chrome/common/extensions_api_resources.grd": {
-    "includes": [26500],
+    "includes": [26400],
   },
   "extensions/extensions_resources.grd": {
-    "includes": [26750],
+    "includes": [26600],
+  },
+  "extensions/renderer/resources/extensions_renderer_resources.grd": {
+    "includes": [26800],
   },
   "extensions/extensions_strings.grd": {
     "messages": [27000],