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

Unified Diff: tracing/tracing/model/user_model/user_model.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/model/thread.html ('k') | tracing/tracing/results2_template.html » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: tracing/tracing/model/user_model/user_model.html
diff --git a/tracing/tracing/model/user_model/user_model.html b/tracing/tracing/model/user_model/user_model.html
index a4188ece21e4c8f5aab2c19ed9a7df832b5f4ec3..fd30d6a610b113da9c1da2557e0e0d2201b7c108 100644
--- a/tracing/tracing/model/user_model/user_model.html
+++ b/tracing/tracing/model/user_model/user_model.html
@@ -44,13 +44,8 @@ tr.exportTo('tr.model.um', function() {
addCategoriesToDict: function(categoriesDict) {
},
- findTopmostSlicesInThisContainer: function(eventPredicate, callback,
- opt_this) {
- },
-
- childEvents: function*(eventTypePredicate, opt_this) {
- if (eventTypePredicate.call(opt_this, tr.model.um.UserExpectation))
- yield * this.expectations;
+ childEvents: function*() {
+ yield * this.expectations;
},
childEventContainers: function*() {
« no previous file with comments | « tracing/tracing/model/thread.html ('k') | tracing/tracing/results2_template.html » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698