[polymer] Merge of master into polymer10-migration

tracing/tracing/ui/base/overlay.html

Index: tracing/tracing/ui/base/overlay.html
diff --git a/tracing/tracing/ui/base/overlay.html b/tracing/tracing/ui/base/overlay.html
index a7196420d5bb2afc98f5afb7824de275045b2b50..634423bf1ea2248819940788bfdfde07ffae40eb 100644
--- a/tracing/tracing/ui/base/overlay.html
+++ b/tracing/tracing/ui/base/overlay.html
@@ -226,6 +226,7 @@ tr.exportTo('tr.ui.b', function() {
       if (this.userCanClose_) {
         this.addEventListener('keydown', this.onKeyDown_.bind(this));
         this.addEventListener('click', this.onDocumentClick_.bind(this));
+        this.closeBtn_.addEventListener('click', this.onClose_);
       }
 
       this.parentEl_.addEventListener('focusin', this.onFocusIn_);