Commit d82eb762 authored by Jan Wilken Dörrie's avatar Jan Wilken Dörrie Committed by Commit Bot

Revert "[Reland] WebUI: Stop auto-generating Polymer 3 version of cr-splitter."

This reverts commit 07b113c5.

Reason for revert: Breaks create_tarball step on Deterministic Linux builders: https://crbug.com/1043039

Original change's description:
> [Reland] WebUI: Stop auto-generating Polymer 3 version of cr-splitter.
> 
> The Polymer 2 version is not used anymore, therefore no auto-generation
> is necessary and the v3 version can be directly checked in.
> 
> Fixed: 1042545
> Change-Id: Ia0267cef30dcf1eb08677d369fd3f8ded21c679f
> Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2006421
> Commit-Queue: Demetrios Papadopoulos <dpapad@chromium.org>
> Auto-Submit: Demetrios Papadopoulos <dpapad@chromium.org>
> Reviewed-by: Rebekah Potter <rbpotter@chromium.org>
> Cr-Commit-Position: refs/heads/master@{#732725}

TBR=dpapad@chromium.org,rbpotter@chromium.org

Change-Id: I59eb715d4f775f98fb9a71d37889bbefbe3d86f7
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2006349Reviewed-by: default avatarJan Wilken Dörrie <jdoerrie@chromium.org>
Commit-Queue: Jan Wilken Dörrie <jdoerrie@chromium.org>
Cr-Commit-Position: refs/heads/master@{#732762}
parent facaf882
......@@ -189,7 +189,7 @@ js_library("app") {
":store",
":store_client",
"//third_party/polymer/v3_0/components-chromium/polymer:polymer_bundled",
"//ui/webui/resources/cr_elements/cr_splitter:cr_splitter",
"//ui/webui/resources/cr_elements/cr_splitter:cr_splitter.m",
"//ui/webui/resources/js:find_shortcut_behavior.m",
"//ui/webui/resources/js:load_time_data.m",
]
......
......@@ -6,7 +6,7 @@ import 'chrome://resources/cr_components/managed_footnote/managed_footnote.m.js'
import 'chrome://resources/cr_elements/shared_vars_css.m.js';
import 'chrome://resources/cr_elements/cr_button/cr_button.m.js';
import 'chrome://resources/cr_elements/cr_toast/cr_toast_manager.m.js';
import 'chrome://resources/cr_elements/cr_splitter/cr_splitter.js';
import 'chrome://resources/cr_elements/cr_splitter/cr_splitter.m.js';
import './folder_node.js';
import './list.js';
import './router.js';
......
......@@ -6,7 +6,7 @@ import {assert} from 'chrome://resources/js/assert.m.js';
import {isMac, isWindows} from 'chrome://resources/js/cr.m.js';
import {loadTimeData} from 'chrome://resources/js/load_time_data.m.js';
import {PromiseResolver} from 'chrome://resources/js/promise_resolver.m.js';
import {Polymer} from 'chrome://resources/polymer/v3_0/polymer/polymer_bundled.min.js';
import {html, Polymer} from 'chrome://resources/polymer/v3_0/polymer/polymer_bundled.min.js';
import {BackgroundGraphicsModeRestriction, Policies} from '../native_layer.js';
......
......@@ -12,7 +12,7 @@ const polymerUrl = 'chrome://resources/polymer/v3_0/';
// TODO: Determine whether it is worth maintaining this list vs always checking
// both directories for the existence of a file.
const nonGeneratedFiles = ['cr.m.js', 'cr_splitter.js', 'action_link.js'];
const nonGeneratedFiles = ['cr.m.js', 'action_link.js'];
function normalizeSlashes(filepath) {
return filepath.replace(/\\/gi, '/');
......
......@@ -22,6 +22,7 @@ js_modulizer("modulize") {
"cr_radio_button_test.js",
"cr_radio_group_test.js",
"cr_search_field_tests.js",
"cr_splitter_test.js",
"cr_toolbar_search_field_tests.js",
"cr_tabs_test.js",
"cr_toast_test.js",
......
......@@ -400,6 +400,28 @@ TEST_F('CrElementsSliderTest', 'All', function() {
mocha.run();
});
/**
* @constructor
* @extends {CrElementsBrowserTest}
*/
function CrElementsSplitterTest() {}
CrElementsSplitterTest.prototype = {
__proto__: CrElementsBrowserTest.prototype,
/** @override */
browsePreload: 'chrome://resources/cr_elements/cr_splitter/cr_splitter.html',
/** @override */
extraLibraries: CrElementsBrowserTest.prototype.extraLibraries.concat([
'cr_splitter_test.js',
]),
};
TEST_F('CrElementsSplitterTest', 'All', function() {
mocha.run();
});
/**
* @constructor
* @extends {CrElementsBrowserTest}
......
......@@ -188,7 +188,7 @@ GEN('#endif');
var CrElementsSplitterV3Test = class extends CrElementsV3BrowserTest {
/** @override */
get browsePreload() {
return 'chrome://test?module=cr_elements/cr_splitter_test.js';
return 'chrome://test?module=cr_elements/cr_splitter_test.m.js';
}
};
......
......@@ -2,7 +2,9 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
import 'chrome://resources/cr_elements/cr_splitter/cr_splitter.js';
// clang-format off
// #import 'chrome://resources/cr_elements/cr_splitter/cr_splitter.m.js';
// clang-format on
suite('cr-splitter', function() {
let crSplitter;
......
......@@ -46,6 +46,7 @@ group("closure_compile") {
"cr_radio_button:closure_compile_module",
"cr_radio_group:closure_compile_module",
"cr_search_field:closure_compile_module",
"cr_splitter:closure_compile_module",
"cr_tabs:closure_compile_module",
"cr_toast:closure_compile_module",
"cr_toggle:closure_compile_module",
......@@ -171,6 +172,7 @@ group("polymer3_elements") {
"cr_radio_group:cr_radio_group_module",
"cr_search_field:cr_search_field_module",
"cr_search_field:modulize",
"cr_splitter:cr_splitter_module",
"cr_tabs:cr_tabs_module",
"cr_toast:cr_toast_manager_module",
"cr_toast:cr_toast_module",
......
......@@ -3,14 +3,32 @@
# found in the LICENSE file.
import("//third_party/closure_compiler/compile_js.gni")
import("//tools/polymer/polymer.gni")
js_type_check("closure_compile") {
is_polymer3 = true
deps = [ ":cr_splitter" ]
}
js_library("cr_splitter") {
}
polymer_modulizer("cr_splitter") {
js_file = "cr_splitter.js"
html_file = "cr_splitter.html"
html_type = "dom-module"
}
js_type_check("closure_compile_module") {
is_polymer3 = true
deps = [ ":cr_splitter.m" ]
}
js_library("cr_splitter.m") {
sources = [
"$root_gen_dir/ui/webui/resources/cr_elements/cr_splitter/cr_splitter.m.js",
]
deps = [
"//third_party/polymer/v3_0/components-chromium/polymer:polymer_bundled",
]
extra_deps = [ ":cr_splitter_module" ]
}
<link rel="import" href="../../html/polymer.html">
<dom-module id="cr-splitter">
<template>
</template>
<script src="cr_splitter.js"></script>
</dom-module>
......@@ -2,7 +2,7 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
import {Polymer} from 'chrome://resources/polymer/v3_0/polymer/polymer_bundled.min.js';
(function() {
// TODO(arv): Currently this only supports horizontal layout.
// TODO(arv): This ignores min-width and max-width of the elements to the
......@@ -40,8 +40,6 @@ function getZoomFactor(doc) {
Polymer({
is: 'cr-splitter',
_template: null,
properties: {
resizeNextElement: {
type: Boolean,
......@@ -268,3 +266,4 @@ Polymer({
this.classList.remove('splitter-active');
},
});
})();
......@@ -154,6 +154,14 @@
file="cr_elements/cr_slider/cr_slider.js"
type="chrome_html"
compress="gzip" />
<structure name="IDR_CR_ELEMENTS_CR_SPLITTER_HTML"
file="cr_elements/cr_splitter/cr_splitter.html"
type="chrome_html"
compress="gzip" />
<structure name="IDR_CR_ELEMENTS_CR_SPLITTER_JS"
file="cr_elements/cr_splitter/cr_splitter.js"
type="chrome_html"
compress="gzip" />
<if expr="chromeos">
<structure name="IDR_CR_ELEMENTS_CR_SEARCHABLE_DROP_DOWN_HTML"
file="cr_elements/cr_searchable_drop_down/cr_searchable_drop_down.html"
......
......@@ -116,8 +116,9 @@
use_base_dir="false"
type="BINDATA"
compress="gzip" />
<include name="IDR_CR_ELEMENTS_CR_SPLITTER_JS"
file="cr_elements/cr_splitter/cr_splitter.js"
<include name="IDR_CR_ELEMENTS_CR_SPLITTER_M_JS"
file="${root_gen_dir}/ui/webui/resources/cr_elements/cr_splitter/cr_splitter.m.js"
use_base_dir="false"
type="BINDATA"
compress="gzip" />
<include name="IDR_CR_ELEMENTS_CR_TABS_M_JS"
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment