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

Unified Diff: third_party/polymer/components/paper-toast/metadata.html

Issue 2162963002: [polymer] Merge of master into polymer10-migration (Closed) Base URL: git@github.com:catapult-project/catapult.git@polymer10-migration
Patch Set: Merge polymer10-migration int polymer10-merge Created 4 years, 5 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: third_party/polymer/components/paper-toast/metadata.html
diff --git a/third_party/polymer/components/core-tooltip/metadata.html b/third_party/polymer/components/paper-toast/metadata.html
similarity index 67%
copy from third_party/polymer/components/core-tooltip/metadata.html
copy to third_party/polymer/components/paper-toast/metadata.html
index ffcf73ac715663984858a5a7f2cac093485a0762..6c9c211e286a1e8e845a5afb152918fef73f187b 100644
--- a/third_party/polymer/components/core-tooltip/metadata.html
+++ b/third_party/polymer/components/paper-toast/metadata.html
@@ -1,20 +1,20 @@
<!--
@license
- Copyright (c) 2015 The Polymer Project Authors. All rights reserved.
+ Copyright (c) 2014 The Polymer Project Authors. All rights reserved.
This code may only be used under the BSD style license found at http://polymer.github.io/LICENSE.txt
The complete set of authors may be found at http://polymer.github.io/AUTHORS.txt
The complete set of contributors may be found at http://polymer.github.io/CONTRIBUTORS.txt
Code distributed by Google as part of the polymer project is also
subject to an additional IP rights grant found at http://polymer.github.io/PATENTS.txt
-->
-<x-meta id="core-tooltip" label="Tooltip" group="Core">
+<x-meta id="paper-toast" label="Toast" group="Paper" isContainer>
+
<template>
- <core-tooltip label="I'm a tooltip">
- <span>Hover over me.</span>
- </core-tooltip>
+ <paper-toast text="Toast!"></paper-toast>
</template>
+
<template id="imports">
- <link rel="import" href="core-tooltip.html">
+ <link rel="import" href="paper-toast.html">
</template>
+
</x-meta>
-
« no previous file with comments | « third_party/polymer/components/paper-toast/demo.html ('k') | third_party/polymer/components/paper-toast/paper-toast.css » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698