DevTools: Support properly multiple targets in sources panel

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 34 matching lines @@
     refreshButton.title = WebInspector.UIString("Refresh");
     this.titleElement.appendChild(refreshButton);
 
     var addButton = document.createElement("button");
     addButton.className = "pane-title-button add";
     addButton.addEventListener("click", this._addButtonClicked.bind(this), false);
     this.titleElement.appendChild(addButton);
     addButton.title = WebInspector.UIString("Add watch expression");
 
     this._requiresUpdate = true;
+    WebInspector.executionContextSelector.addExecutionContextChangeListener(this.refreshExpressions, this);
 }
 
 WebInspector.WatchExpressionsSidebarPane.prototype = {
     wasShown: function()
     {
         this._refreshExpressionsIfNeeded();
     },
 
-    reset: function()
-    {
-        this.refreshExpressions();
-    },
-
     refreshExpressions: function()
     {
         this._requiresUpdate = true;
         this._refreshExpressionsIfNeeded();
     },
 
     addExpression: function(expression)
     {
         this.section.addExpression(expression);
         this.expand();
@@ skipping 118 matching lines @@
         // in appendResult()
         var propertyCount = 0;
         for (var i = 0; i < this.watchExpressions.length; ++i) {
             if (!this.watchExpressions[i])
                 continue;
             ++propertyCount;
         }
 
         // Now process all the expressions, since we have the actual count,
         // which is checked in the appendResult inner function.
-        var currentExecutionContext = WebInspector.context.flavor(WebInspector.ExecutionContext);
+        var currentExecutionContext = WebInspector.executionContextSelector.currentExecutionContext();
         if (currentExecutionContext) {
             for (var i = 0; i < this.watchExpressions.length; ++i) {
                 var expression = this.watchExpressions[i];
                 if (!expression)
                     continue;
 
                 currentExecutionContext.evaluate(expression, this._watchObjectGroupId, false, true, false, false, appendResult.bind(this, expression, i));
             }
         }
 
@@ skipping 291 matching lines @@
     },
 
     oncollapse: function()
     {
         WebInspector.ObjectPropertyTreeElement.prototype.oncollapse.call(this);
         delete this.treeOutline.section._expandedProperties[this.propertyPath()];
     },
 
     __proto__: WebInspector.ObjectPropertyTreeElement.prototype
 }