[DevTools] Typed events and event listeners.

third_party/WebKit/Source/devtools/front_end/sources/NavigatorView.js

Index: third_party/WebKit/Source/devtools/front_end/sources/NavigatorView.js
diff --git a/third_party/WebKit/Source/devtools/front_end/sources/NavigatorView.js b/third_party/WebKit/Source/devtools/front_end/sources/NavigatorView.js
index 2ef3d1cf0a208504e9ba6affc558ccda0da60901..91d1802bae93003cb6eb7276e9013456cb290e71 100644
--- a/third_party/WebKit/Source/devtools/front_end/sources/NavigatorView.js
+++ b/third_party/WebKit/Source/devtools/front_end/sources/NavigatorView.js
@@ -62,17 +62,7 @@ Sources.NavigatorView = class extends UI.VBox {
     SDK.targetManager.addModelListener(
         SDK.ResourceTreeModel, SDK.ResourceTreeModel.Events.FrameDetached, this._frameDetached, this);
 
-    if (Runtime.experiments.isEnabled('persistence2')) {
-      Persistence.persistence.addEventListener(
-          Persistence.Persistence.Events.BindingCreated, this._onBindingChanged, this);
-      Persistence.persistence.addEventListener(
-          Persistence.Persistence.Events.BindingRemoved, this._onBindingChanged, this);
-    } else {
-      Persistence.persistence.addEventListener(
-          Persistence.Persistence.Events.BindingCreated, this._onBindingCreated, this);
-      Persistence.persistence.addEventListener(
-          Persistence.Persistence.Events.BindingRemoved, this._onBindingRemoved, this);
-    }
+    Persistence.persistence.addEventListener(Persistence.Persistence.BindingChangedEvent, this._onBindingChanged, this);
     SDK.targetManager.addEventListener(SDK.TargetManager.Events.NameChanged, this._targetNameChanged, this);
 
     SDK.targetManager.observeTargets(this);
@@ -166,42 +156,32 @@ Sources.NavigatorView = class extends UI.VBox {
   }
 
   /**
-   * @param {!Common.Event} event
-   */
-  _onBindingCreated(event) {
-    var binding = /** @type {!Persistence.PersistenceBinding} */ (event.data);
-    this._removeUISourceCode(binding.network);
-  }
-
-  /**
-   * @param {!Common.Event} event
-   */
-  _onBindingRemoved(event) {
-    var binding = /** @type {!Persistence.PersistenceBinding} */ (event.data);
-    this._addUISourceCode(binding.network);
-  }
-
-  /**
-   * @param {!Common.Event} event
+   * @param {!Persistence.Persistence.BindingChangedEvent} event
    */
   _onBindingChanged(event) {
-    var binding = /** @type {!Persistence.PersistenceBinding} */ (event.data);
+    if (!Runtime.experiments.isEnabled('persistence2')) {
+      if (event.created)
+        this._removeUISourceCode(event.binding.network);
+      else
+        this._addUISourceCode(event.binding.network);
+      return;
+    }
 
     // Update UISourceCode titles.
-    var networkNode = this._uiSourceCodeNodes.get(binding.network);
+    var networkNode = this._uiSourceCodeNodes.get(event.binding.network);
     if (networkNode)
       networkNode.updateTitle();
-    var fileSystemNode = this._uiSourceCodeNodes.get(binding.fileSystem);
+    var fileSystemNode = this._uiSourceCodeNodes.get(event.binding.fileSystem);
     if (fileSystemNode)
       fileSystemNode.updateTitle();
 
     // Update folder titles.
-    var pathTokens = Persistence.FileSystemWorkspaceBinding.relativePath(binding.fileSystem);
+    var pathTokens = Persistence.FileSystemWorkspaceBinding.relativePath(event.binding.fileSystem);
     var folderPath = '';
     for (var i = 0; i < pathTokens.length - 1; ++i) {
       folderPath += pathTokens[i];
-      var folderId =
-          this._folderNodeId(binding.fileSystem.project(), null, null, binding.fileSystem.origin(), folderPath);
+      var folderId = this._folderNodeId(
+          event.binding.fileSystem.project(), null, null, event.binding.fileSystem.origin(), folderPath);
       var folderNode = this._subfolderNodes.get(folderId);
       if (folderNode)
         folderNode.updateTitle();
@@ -209,7 +189,7 @@ Sources.NavigatorView = class extends UI.VBox {
     }
 
     // Update fileSystem root title.
-    var fileSystemRoot = this._rootNode.child(binding.fileSystem.project().id());
+    var fileSystemRoot = this._rootNode.child(event.binding.fileSystem.project().id());
     if (fileSystemRoot)
       fileSystemRoot.updateTitle();
   }