Settings Revamp: Update all of Settings to use compiled_resources2.gyp

BUG=585553

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

Cr-Commit-Position: refs/heads/master@{#379404}

6 files changed, 95 insertions, 133 deletions

diff --git a/ui/webui/resources/cr_elements/compiled_resources.gyp b/ui/webui/resources/cr_elements/compiled_resources2.gyp
index 7b24a06..cbd3234 100644
--- a/ui/webui/resources/cr_elements/compiled_resources.gyp
+++ b/ui/webui/resources/cr_elements/compiled_resources2.gyp
@@ -7,8 +7,8 @@
       'target_name': 'cr_elements_resources',
       'type': 'none',
       'dependencies': [
-        'network/compiled_resources.gyp:*',
-        'policy/compiled_resources.gyp:*',
+        'network/compiled_resources2.gyp:*',
+        'policy/compiled_resources2.gyp:*',
       ],
     },
   ]
diff --git a/ui/webui/resources/cr_elements/network/compiled_resources.gyp b/ui/webui/resources/cr_elements/network/compiled_resources.gyp
deleted file mode 100644
index 601aead..0000000
--- a/ui/webui/resources/cr_elements/network/compiled_resources.gyp
+++ /dev/null
@@ -1,43 +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': [
-    {
-      'target_name': 'cr_network_icon',
-      'variables': {
-        'depends': [
-          'cr_onc_types.js',
-        ],
-        'externs': [
-          '../../../../../third_party/closure_compiler/externs/networking_private.js'
-        ],
-      },
-      'includes': ['../../../../../third_party/closure_compiler/compile_js.gypi'],
-    },
-    {
-      'target_name': 'cr_network_list',
-      'variables': {
-        'depends': [
-          '../../../../../third_party/jstemplate/compiled_resources.gyp:jstemplate',
-          'cr_onc_types.js',
-          'cr_network_list_item.js',
-          '../../../../../ui/webui/resources/js/load_time_data.js',
-        ],
-        'externs': [
-          '../../../../../third_party/closure_compiler/externs/networking_private.js'
-        ],
-      },
-      'includes': ['../../../../../third_party/closure_compiler/compile_js.gypi'],
-    },
-    {
-      'target_name': 'cr_network_select',
-      'variables': {
-        'depends': [
-          'compiled_resources.gyp:cr_network_list',
-        ],
-      },
-      'includes': ['../../../../../third_party/closure_compiler/compile_js.gypi'],
-    }, 
-  ],
-}
diff --git a/ui/webui/resources/cr_elements/network/compiled_resources2.gyp b/ui/webui/resources/cr_elements/network/compiled_resources2.gyp
new file mode 100644
index 0000000..a4f8930
--- /dev/null
+++ b/ui/webui/resources/cr_elements/network/compiled_resources2.gyp
@@ -0,0 +1,44 @@
+# 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': [
+    {
+      'target_name': 'cr_network_icon',
+      'dependencies': [
+        'cr_onc_types',
+      ],
+      'includes': ['../../../../../third_party/closure_compiler/compile_js2.gypi'],
+    },
+    {
+      'target_name': 'cr_network_list',
+      'dependencies': [
+        'cr_onc_types',
+      ],
+      'includes': ['../../../../../third_party/closure_compiler/compile_js2.gypi'],
+    },
+    {
+      'target_name': 'cr_network_list_item',
+      'dependencies': [
+        '<(DEPTH)/ui/webui/resources/js/compiled_resources2.gyp:load_time_data',
+        'cr_onc_types',
+      ],
+      'includes': ['../../../../../third_party/closure_compiler/compile_js2.gypi'],
+    },
+    {
+      'target_name': 'cr_network_select',
+      'dependencies': [
+        '<(EXTERNS_GYP):networking_private',
+        'cr_onc_types',
+      ],
+      'includes': ['../../../../../third_party/closure_compiler/compile_js2.gypi'],
+    },
+    {
+      'target_name': 'cr_onc_types',
+      'dependencies': [
+        '<(EXTERNS_GYP):networking_private',
+      ],
+      'includes': ['../../../../../third_party/closure_compiler/compile_js2.gypi'],
+    },
+  ],
+}
diff --git a/ui/webui/resources/cr_elements/policy/compiled_resources.gyp b/ui/webui/resources/cr_elements/policy/compiled_resources.gyp
deleted file mode 100644
index 4d35786..0000000
--- a/ui/webui/resources/cr_elements/policy/compiled_resources.gyp
+++ /dev/null
@@ -1,81 +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': [
-    {
-      'target_name': 'cr_policy_indicator_behavior',
-      'variables': {
-        'depends': [
-          '../../../../../ui/webui/resources/js/compiled_resources.gyp:assert',
-          '../../../../../ui/webui/resources/js/compiled_resources.gyp:load_time_data',
-        ],
-      },
-      'includes': ['../../../../../third_party/closure_compiler/compile_js.gypi'],
-    },
-    {
-      'target_name': 'cr_policy_pref_behavior',
-      'variables': {
-        'depends': [
-          '../../../../../third_party/polymer/v1_0/components-chromium/iron-iconset-svg/iron-iconset-svg-extracted.js',
-          '../../../../../third_party/polymer/v1_0/components-chromium/iron-meta/iron-meta-extracted.js',
-          '../../../../../ui/webui/resources/js/compiled_resources.gyp:assert',
-          '../../../../../ui/webui/resources/js/compiled_resources.gyp:load_time_data',
-          'cr_policy_indicator_behavior.js',
-        ],
-        'externs': [
-          '../../../../../third_party/closure_compiler/externs/settings_private.js'
-        ],
-      },
-      'includes': ['../../../../../third_party/closure_compiler/compile_js.gypi'],
-    },
-    {
-      'target_name': 'cr_policy_pref_indicator',
-      'variables': {
-        'depends': [
-          '../../../../../ui/webui/resources/js/compiled_resources.gyp:assert',
-          '../../../../../ui/webui/resources/js/compiled_resources.gyp:load_time_data',
-          'cr_policy_indicator_behavior.js',
-          'cr_policy_pref_behavior.js',
-        ],
-        'externs': [
-          '../../../../../third_party/closure_compiler/externs/settings_private.js'
-        ],
-      },
-      'includes': ['../../../../../third_party/closure_compiler/compile_js.gypi'],
-    },
-    {
-      'target_name': 'cr_policy_network_behavior',
-      'variables': {
-        'depends': [
-          '../../../../../third_party/polymer/v1_0/components-chromium/iron-iconset-svg/iron-iconset-svg-extracted.js',
-          '../../../../../third_party/polymer/v1_0/components-chromium/iron-meta/iron-meta-extracted.js',
-          '../../../../../ui/webui/resources/js/compiled_resources.gyp:assert',
-          '../../../../../ui/webui/resources/js/compiled_resources.gyp:load_time_data',
-          '../network/cr_onc_types.js',
-          'cr_policy_indicator_behavior.js',
-        ],
-        'externs': [
-          '../../../../../third_party/closure_compiler/externs/networking_private.js',
-        ],
-      },
-      'includes': ['../../../../../third_party/closure_compiler/compile_js.gypi'],
-    },
-    {
-      'target_name': 'cr_policy_network_indicator',
-      'variables': {
-        'depends': [
-          '../../../../../ui/webui/resources/js/compiled_resources.gyp:assert',
-          '../../../../../ui/webui/resources/js/compiled_resources.gyp:load_time_data',
-          '../network/cr_onc_types.js',
-          'cr_policy_indicator_behavior.js',
-          'cr_policy_network_behavior.js',
-        ],
-        'externs': [
-          '../../../../../third_party/closure_compiler/externs/networking_private.js',
-        ],
-      },
-      'includes': ['../../../../../third_party/closure_compiler/compile_js.gypi'],
-    },
-  ],
-}
diff --git a/ui/webui/resources/cr_elements/policy/compiled_resources2.gyp b/ui/webui/resources/cr_elements/policy/compiled_resources2.gyp
new file mode 100644
index 0000000..7e71e2b
--- /dev/null
+++ b/ui/webui/resources/cr_elements/policy/compiled_resources2.gyp
@@ -0,0 +1,44 @@
+# 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': [
+    {
+      'target_name': 'cr_policy_indicator_behavior',
+      'dependencies': [
+        '<(DEPTH)/ui/webui/resources/js/compiled_resources2.gyp:assert',
+        '<(DEPTH)/ui/webui/resources/js/compiled_resources2.gyp:load_time_data',
+      ],
+      'includes': ['../../../../../third_party/closure_compiler/compile_js2.gypi'],
+    },
+    {
+      'target_name': 'cr_policy_pref_behavior',
+      'dependencies': [
+        'cr_policy_indicator_behavior',
+      ],
+      'includes': ['../../../../../third_party/closure_compiler/compile_js2.gypi'],
+    },
+    {
+      'target_name': 'cr_policy_pref_indicator',
+      'dependencies': [
+        '<(EXTERNS_GYP):settings_private',
+        'cr_policy_indicator_behavior',
+        'cr_policy_pref_behavior',
+      ],
+      'includes': ['../../../../../third_party/closure_compiler/compile_js2.gypi'],
+    },
+    {
+      'target_name': 'cr_policy_network_behavior',
+      'includes': ['../../../../../third_party/closure_compiler/compile_js2.gypi'],
+    },
+    {
+      'target_name': 'cr_policy_network_indicator',
+      'dependencies': [
+        '../network/compiled_resources2.gyp:cr_onc_types',
+        'cr_policy_indicator_behavior',
+        'cr_policy_network_behavior',
+      ],
+      'includes': ['../../../../../third_party/closure_compiler/compile_js2.gypi'],
+    },
+  ],
+}
diff --git a/ui/webui/resources/js/chromeos/compiled_resources.gyp b/ui/webui/resources/js/chromeos/compiled_resources2.gyp
index 05e7e0a..a363475 100644
--- a/ui/webui/resources/js/chromeos/compiled_resources.gyp
+++ b/ui/webui/resources/js/chromeos/compiled_resources2.gyp
@@ -5,13 +5,11 @@
   'targets': [
     {
       'target_name': 'ui_account_tweaks',
-      'variables': {
-        'depends': [
-          '../compiled_resources.gyp:cr',
-          '../compiled_resources.gyp:load_time_data',
-        ],
-      },
-      'includes': ['../../../../../third_party/closure_compiler/compile_js.gypi'],
+      'dependencies': [
+        '../compiled_resources2.gyp:cr',
+        '../compiled_resources2.gyp:load_time_data',
+      ],
+      'includes': ['../../../../../third_party/closure_compiler/compile_js2.gypi'],
     },
   ]
 }