Remove enable_polymer_v08 flag from build

Always build Polymer 0.8 and 0.5. Polymer 0.5 should be removed in M45.

BUG=483080
R=jlklein@chromium.org
TEST=manual

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

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

ui/resources/BUILD.gn

@@ -5,11 +5,6 @@
 import("//tools/grit/grit_rule.gni")
 import("//tools/grit/repack.gni")
 
-declare_args() {
-  # Enable to include Polymer 0.8 in the binary.
-  enable_polymer_v08 = false
-}
-
 # GYP version: ui/resources/ui_resources.gyp:ui_resources
 group("resources") {
   deps = [
@@ -40,11 +35,6 @@ grit("ui_unscaled_resources_grd") {
   ]
 }
 
-webui_grit_defines = []
-if (enable_polymer_v08) {
-  webui_grit_defines += [ "enable_polymer_v08" ]
-}
-
 grit("webui_resources_grd") {
   source = "../webui/resources/webui_resources.grd"
   outputs = [
@@ -53,7 +43,6 @@ grit("webui_resources_grd") {
     "grit/webui_resources_map.h",
     "webui_resources.pak",
   ]
-  defines = webui_grit_defines
 }
 
 if (!is_mac) {

ui/resources/ui_resources.gyp

@@ -9,9 +9,6 @@
       'target_name': 'ui_resources',
       'type': 'none',
       'variables': {
-        # Enable to include Polymer 0.8 in the binary.
-        'enable_polymer_v08%': 0,
-
         'grit_out_dir': '<(SHARED_INTERMEDIATE_DIR)/ui/resources',
       },
       'actions': [
@@ -26,12 +23,6 @@
           'action_name': 'webui_resources',
           'variables': {
             'grit_grd_file': '../webui/resources/webui_resources.grd',
-
-            'conditions': [
-              ['enable_polymer_v08==1', {
-                'grit_defines': ['-D', 'enable_polymer_v08'],
-              }],
-            ],
           },
           'includes': [ '../../build/grit_action.gypi' ],
         },

ui/webui/resources/cr_elements_resources.grdp

 <?xml version="1.0" encoding="utf-8"?>
 <grit-part>
+  <!-- Polymer 0.5 Elements (TODO: Remove by M45 branch point) -->
   <structure name="IDR_CR_ELEMENTS_CR_BUTTON_CSS"
              file="../../webui/resources/cr_elements/cr_button/cr_button.css"
              type="chrome_html" />
@@ -104,7 +105,6 @@
              type="chrome_html" />
 
   <!-- Polymer 0.8 Elements -->
-  <if expr="enable_polymer_v08">
   <structure name="IDR_CR_ELEMENTS_08_CR_DEMO_ELEMENT_HTML"
              file="../../webui/resources/cr_elements/v0_8/demo_element.html"
              type="chrome_html" />
@@ -183,5 +183,4 @@
   <structure name="IDR_CR_ELEMENTS_08_CR_TOGGLE_BUTTON_JS"
              file="../../webui/resources/cr_elements/v0_8/cr_toggle_button/cr_toggle_button.js"
              type="chrome_html" />
-  </if>
 </grit-part>

ui/webui/resources/polymer_resources.grdp

 <?xml version="1.0" encoding="utf-8"?>
 <grit-part>
+  <!-- Polymer 0.5 (TODO: Remove by M45 branch point) -->
   <structure name="IDR_POLYMER_CORE_A11Y_KEYS_CORE_A11Y_KEYS_EXTRACTED_JS"
              file="../../../third_party/polymer/components-chromium/core-a11y-keys/core-a11y-keys-extracted.js"
              type="chrome_html" />
@@ -476,7 +477,6 @@
              type="chrome_html" />
 
   <!-- Polymer 0.8 -->
-  <if expr="enable_polymer_v08">
   <structure name="IDR_POLYMER_08_POLYMER_POLYMER_HTML"
              file="../../../third_party/polymer/v0_8/components-chromium/polymer/polymer.html"
              type="chrome_html" />
@@ -823,5 +823,4 @@
   <structure name="IDR_POLYMER_08_MORE_ROUTING_ROUTING_HTML"
              file="../../../third_party/polymer/v0_8/components-chromium/more-routing/routing.html"
              type="chrome_html" />
-  </if>
 </grit-part>