Upstream injected JavaScript for the iOS web layer

ios/web/ios_web.gyp

 # 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.
 
 {
   'variables': {
     'chromium_code': 1,
    },
   'targets': [
     {
@@ skipping 27 matching lines @@
         'public/user_agent.h',
         'public/user_agent.mm',
         'public/web_state/web_state_observer.h',
         'public/web_thread.h',
         'string_util.cc',
         'web_state/web_state_observer.cc',
         'web_thread.cc',
       ],
     },
     {
+      'target_name': 'js_resources',
+      'type': 'none',
+      'sources': [
+        'web_state/js/resources/base.js',
+        'web_state/js/resources/common.js',
+        'web_state/js/resources/message.js',
+        'web_state/js/resources/message_dynamic_ui.js',
+        'web_state/js/resources/message_dynamic_wk.js',
+      ],
+      'link_settings': {
+        'mac_bundle_resources': [
+          '<(SHARED_INTERMEDIATE_DIR)/base.js',
+          '<(SHARED_INTERMEDIATE_DIR)/common.js',
+          '<(SHARED_INTERMEDIATE_DIR)/message.js',
+          '<(SHARED_INTERMEDIATE_DIR)/message_dynamic_ui.js',
+          '<(SHARED_INTERMEDIATE_DIR)/message_dynamic_wk.js',
+        ],
+      },
+      'conditions': [
+        ['enable_wkwebview==1', {

[sdefresne, 2014/12/10 18:29:11]

This variable "enable_wkwebview" is not defined in build/common.gypi upstream.
You'll have to also upstream the definition.

[droger, 2014/12/11 09:36:35]

I am not sure this should go in common.gypi.
Removed.

+          'sources': [
+            'web_state/js/resources/message_dynamic_wk.js',
+          ],
+          'link_settings': {
+            'mac_bundle_resources': [
+              '<(SHARED_INTERMEDIATE_DIR)/message_dynamic_wk.js',
+            ],
+          },
+        }],
+      ],
+      'includes': [
+        'js_compile.gypi'
+      ],
+    },
+    {
       'target_name': 'test_support_ios_web',
       'type': 'static_library',
       'dependencies': [
         'ios_web',
       ],
       'include_dirs': [
         '../..',
       ],
       'sources': [
         'public/test/test_browser_state.cc',
         'public/test/test_browser_state.h',
       ],
     },
   ],
 }