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

Unified Diff: pkg/polymer/lib/polymer.html

Issue 335943003: merge to trunk all changes from 36817 until 37378 under the packages: polymer, (Closed) Base URL: http://dart.googlecode.com/svn/trunk/dart/
Patch Set: Created 6 years, 6 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
« no previous file with comments | « pkg/polymer/lib/polymer.dart ('k') | pkg/polymer/lib/polymer_element.dart » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: pkg/polymer/lib/polymer.html
===================================================================
--- pkg/polymer/lib/polymer.html (revision 37373)
+++ pkg/polymer/lib/polymer.html (working copy)
@@ -4,23 +4,14 @@
license that can be found in the LICENSE file.
-->
-<script src="src/js/use_native_dartium_shadowdom.js"></script>
-
<!--
-These two files are from the Polymer project:
-https://github.com/Polymer/platform/ and https://github.com/Polymer/polymer/.
-
-You can replace platform.js and polymer.html with different versions if desired.
+This file is from the Polymer project (https://github.com/Polymer/polymer/).
+You can replace polymer.html with a different version if desired.
-->
<!-- minified for deployment: -->
-<script src="../../packages/web_components/platform.js"></script>
<link rel="import" href="src/js/polymer/polymer.html">
<!-- unminfied for debugging:
-<script src="../../packages/web_components/platform.concat.js"></script>
+<link rel="import" href="src/js/polymer/layout.html">
<script src="src/js/polymer/polymer.concat.js"></script>
-<link rel="import" href="src/js/polymer/polymer-body.html">
-->
-
-<!-- Teach dart2js about Shadow DOM polyfill objects. -->
-<script src="../../packages/web_components/dart_support.js"></script>
« no previous file with comments | « pkg/polymer/lib/polymer.dart ('k') | pkg/polymer/lib/polymer_element.dart » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698