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

Unified Diff: tracing/tracing/ui/base/tab_view.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
« no previous file with comments | « tracing/tracing/ui/base/pie_chart.html ('k') | tracing/tracing/ui/base/table.html » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: tracing/tracing/ui/base/tab_view.html
diff --git a/tracing/tracing/ui/base/tab_view.html b/tracing/tracing/ui/base/tab_view.html
index 463def18fd3384a118378290e0ab6fc64b45e394..dbd2f9ef3a6fc7e2a76214f3532e96a3b25c9a9d 100644
--- a/tracing/tracing/ui/base/tab_view.html
+++ b/tracing/tracing/ui/base/tab_view.html
@@ -5,6 +5,8 @@ Use of this source code is governed by a BSD-style license that can be
found in the LICENSE file.
-->
+<link rel="import" href="/tracing/ui/analysis/analysis_sub_view.html">
+
<!--
@fileoverview A series of tabs for the analysis view that controls which
analysis sub-view is being displayed.
@@ -55,7 +57,7 @@ and limit users to having one option selected at a time.
border-bottom: 1px solid white;
}
</style>
- <div id='tabs'>
+ <div id='tabs' hidden="[[tabsHidden]]">
<label id=selection_description>[[label_]]</label>
<template is=dom-repeat items=[[subViews_]]>
<tab>
@@ -82,11 +84,15 @@ Polymer({
type: String,
value: () => ''
},
+ selectedSubView_: Object,
subViews_: {
type: Array,
value: () => []
},
- selectedSubView_: Object
+ tabsHidden: {
+ type: Boolean,
+ value: false
+ }
},
set label(newLabel) {
@@ -122,14 +128,6 @@ Polymer({
},
addSubView: function(subView) {
- if (!(subView instanceof HTMLElement) ||
- !subView.behaviors ||
- subView.behaviors.indexOf(
- tr.ui.analysis.behaviors.AnalysisSubView) < 0) {
- throw new Error('Sub-view being added must be a registered Polymer ' +
- 'element with the sub-view behavior');
- }
-
if (!this.selectedSubView_)
this.selectedSubView = subView;
« no previous file with comments | « tracing/tracing/ui/base/pie_chart.html ('k') | tracing/tracing/ui/base/table.html » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698