Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(161)

Unified Diff: tracing/tracing/ui/base/base.html

Issue 2267503002: Import polymer in a single place and remove d3 hacks (Closed) Base URL: https://chromium.googlesource.com/external/github.com/catapult-project/catapult.git@master
Patch Set: Created 4 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: tracing/tracing/ui/base/base.html
diff --git a/tracing/tracing/ui/base/base.html b/tracing/tracing/ui/base/base.html
index 7c4048a9aeffe9e5de68d457d9032a03c39c2590..e0ca9e23c6b27da5b617544725ce249a040a85f2 100644
--- a/tracing/tracing/ui/base/base.html
+++ b/tracing/tracing/ui/base/base.html
@@ -5,27 +5,14 @@ Use of this source code is governed by a BSD-style license that can be
found in the LICENSE file.
-->
-<!--
-@fileoverview This file contains imports that are necessary for global UI
-initialization. These tend to be finnicky about the way in which they're
-imported.
--->
+<link rel="import" href="/tracing/ui/base/polymer_preload.html" data-suppress-import-order>
<!--
-TODO(charliea): Some later import is messing up d3 initialization, causing the
-error message "Uncaught TypeError: Cannot set property 'd3' of undefined." We
-should figure out what's causing this. In the short term, we can just import d3
-first.
--->
-<link rel="import" href="/tracing/ui/base/d3.html" data-suppress-import-order>
-
-<!-- Polymer relies on webcomponents already being imported. -->
-<link rel="import" href="/tracing/ui/base/webcomponents.html" data-suppress-import-order>
-
-<!--
-Polymer's imported through third-party HTML files, which means that we have to
+Polymer is imported through third-party HTML files, which means that we have to
manually list all recursive imports.
-->
<link rel="import" href="/components/polymer/polymer-micro.html" data-suppress-import-order>
<link rel="import" href="/components/polymer/polymer-mini.html" data-suppress-import-order>
<link rel="import" href="/components/polymer/polymer.html" data-suppress-import-order>
+
+<link rel="import" href="/tracing/ui/base/polymer_postload.html" data-suppress-import-order>

Powered by Google App Engine
This is Rietveld 408576698