DevTools: migrate sidebar pane's titleElement to use Toolbar.

Source/devtools/front_end/sources/WatchExpressionsSidebarPane.js

 /*
  * Copyright (C) IBM Corp. 2009  All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are
  * met:
  *
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
  *     * Redistributions in binary form must reproduce the above
@@ skipping 17 matching lines @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
 /**
  * @constructor
  * @extends {WebInspector.SidebarPane}
  */
 WebInspector.WatchExpressionsSidebarPane = function()
 {
     WebInspector.SidebarPane.call(this, WebInspector.UIString("Watch"));
+    this.registerRequiredCSS("components/objectValue.css");
 
     this._requiresUpdate = true;
     /** @type {!Array.<!WebInspector.WatchExpression>} */
     this._watchExpressions = [];
     this._watchExpressionsSetting = WebInspector.settings.createLocalSetting("watchExpressions", []);
 
-    this.registerRequiredCSS("components/objectValue.css");
-    this.bodyElement.classList.add("vbox", "watch-expressions");
-    this.bodyElement.addEventListener("contextmenu", this._contextMenu.bind(this), false);
+    var addButton = new WebInspector.ToolbarButton(WebInspector.UIString("Add expression"), "add-toolbar-item");
+    addButton.addEventListener("click", this._addButtonClicked.bind(this));
+    this.toolbar().appendToolbarItem(addButton);
+    var refreshButton = new WebInspector.ToolbarButton(WebInspector.UIString("Refresh"), "refresh-toolbar-item");
+    refreshButton.addEventListener("click", this._refreshButtonClicked.bind(this));
+    this.toolbar().appendToolbarItem(refreshButton);
 
-    var refreshButton = this.titleElement.createChild("button", "pane-title-button refresh");
-    refreshButton.addEventListener("click", this._refreshButtonClicked.bind(this), false);
-    refreshButton.title = WebInspector.UIString("Refresh");
+    this._bodyElement = this.element.createChild("div", "vbox watch-expressions");
+    this._bodyElement.addEventListener("contextmenu", this._contextMenu.bind(this), false);
 
-    var addButton = this.titleElement.createChild("button", "pane-title-button add");
-    addButton.addEventListener("click", this._addButtonClicked.bind(this), false);
-    addButton.title = WebInspector.UIString("Add watch expression");
     WebInspector.context.addFlavorChangeListener(WebInspector.ExecutionContext, this.refreshExpressions, this);
 }
 
 WebInspector.WatchExpressionsSidebarPane.prototype = {
     wasShown: function()
     {
         this._refreshExpressionsIfNeeded();
     },
 
     refreshExpressions: function()
@@ skipping 35 matching lines @@
     _refreshExpressionsIfNeeded: function()
     {
         if (this._requiresUpdate && this.isShowing()) {
             this._rebuildWatchExpressions();
             delete this._requiresUpdate;
         } else
             this._requiresUpdate = true;
     },
 
     /**
-     * @param {?Event} event
+     * @param {!WebInspector.Event} event
      */
     _addButtonClicked: function(event)
     {
         if (event)

[dgozman, 2015/06/09 13:27:02]

Remove |if (event)|.

[pfeldman, 2015/06/09 13:40:59]

Done.

             event.consume(true);
         this.expand();
         this._createWatchExpression(null).startEditing();
     },
 
     /**
-     * @param {!Event} event
+     * @param {!WebInspector.Event} event
      */
     _refreshButtonClicked: function(event)
     {
         event.consume();
         this.refreshExpressions();
     },
 
     _rebuildWatchExpressions: function()
     {
-        this.bodyElement.removeChildren();
+        this._bodyElement.removeChildren();
         this._watchExpressions = [];
-        this._emptyElement = this.bodyElement.createChild("div", "info");
+        this._emptyElement = this._bodyElement.createChild("div", "info");
         this._emptyElement.textContent = WebInspector.UIString("No Watch Expressions");
         var watchExpressionStrings = this._watchExpressionsSetting.get();
         for (var i = 0; i < watchExpressionStrings.length; ++i) {
             var expression = watchExpressionStrings[i];
             if (!expression)
                 continue;
 
             this._createWatchExpression(expression);
         }
     },
 
     /**
      * @param {?string} expression
      * @return {!WebInspector.WatchExpression}
      */
     _createWatchExpression: function(expression)
     {
         this._emptyElement.classList.add("hidden");
         var watchExpression = new WebInspector.WatchExpression(expression);
         watchExpression.addEventListener(WebInspector.WatchExpression.Events.ExpressionUpdated, this._watchExpressionUpdated.bind(this));
-        this.bodyElement.appendChild(watchExpression.element());
+        this._bodyElement.appendChild(watchExpression.element());
         this._watchExpressions.push(watchExpression);
         return watchExpression;
     },
 
     /**
      * @param {!WebInspector.Event} event
      */
     _watchExpressionUpdated: function(event)
     {
         var watchExpression = /** @type {!WebInspector.WatchExpression} */ (event.target);
         if (!watchExpression.expression()) {
             this._watchExpressions.remove(watchExpression);
-            this.bodyElement.removeChild(watchExpression.element());
+            this._bodyElement.removeChild(watchExpression.element());
             this._emptyElement.classList.toggle("hidden", !!this._watchExpressions.length);
         }
 
         this._saveExpressions();
     },
 
     /**
      * @param {!Event} event
      */
     _contextMenu: function(event)
@@ skipping 246 matching lines @@
             contextMenu.appendApplicableItems(this._result);
     },
 
     _copyValueButtonClicked: function()
     {
         InspectorFrontendHost.copyText(this._valueElement.textContent);
     },
 
     __proto__: WebInspector.Object.prototype
 }