| Index: tracing/tracing/ui/base/polymer_preload.html
|
| diff --git a/tracing/tracing/ui/base/polymer_preload.html b/tracing/tracing/ui/base/polymer_preload.html
|
| index 4c21ef991ca0d1fb9cc1c3a9715928fd09317b4f..6f0a813e6734eabf12826d1f39318b1631ba468c 100644
|
| --- a/tracing/tracing/ui/base/polymer_preload.html
|
| +++ b/tracing/tracing/ui/base/polymer_preload.html
|
| @@ -7,10 +7,11 @@ found in the LICENSE file.
|
| <script>
|
| 'use strict';
|
|
|
| -// Force Polymer into native shadowDom mode
|
| -if (window.Polymer) {
|
| - throw new Error('Cannot proceed. Polymer already present.');
|
| +// Configure Polymer to use native shadow DOM instead of shady DOM.
|
| +if (!window.Polymer) {
|
| + window.Polymer = {};
|
| + window.Polymer.dom = 'shadow';
|
| +} else if (!window.Polymer.Settings.useNativeShadow) {
|
| + throw new Error('Polymer already initialized without useNativeShadow.');
|
| }
|
| -window.Polymer = {};
|
| -window.Polymer.dom = 'shadow';
|
| </script>
|
|
|