Chromium Code Reviews| Index: ui/webui/resources/js/polymer_config.js |
| diff --git a/ui/webui/resources/js/polymer_config.js b/ui/webui/resources/js/polymer_config.js |
| index 02e4d9f305bf5b184ca1a0db4d0d07cd0fa6081d..8f7158017b17647a610c9799302f3d3bb82cb79d 100644 |
| --- a/ui/webui/resources/js/polymer_config.js |
| +++ b/ui/webui/resources/js/polymer_config.js |
| @@ -2,12 +2,17 @@ |
| // Use of this source code is governed by a BSD-style license that can be |
| // found in the LICENSE file. |
| -if (typeof Polymer == 'undefined') { |
| - Polymer = { |
| - dom: 'shadow', |
| - lazyRegister: true, |
| - useNativeCSSProperties: true, |
| - }; |
| -} else { |
| - console.error('Polymer is already defined.'); |
| +var isChromePolymerInitialized; |
| + |
| +if (!isChromePolymerInitialized) { |
| + isChromePolymerInitialized = true; |
|
stevenjb
2016/07/07 16:58:41
Make this change in a separate CL. Add dbeam@ and
Alexander Alekseev
2016/07/08 01:12:29
Done.
|
| + if (typeof Polymer == 'undefined') { |
| + Polymer = { |
| + dom: 'shadow', |
| + lazyRegister: true, |
| + useNativeCSSProperties: true, |
| + }; |
| + } else { |
| + console.error('Polymer is already defined.'); |
| + } |
| } |