Backed out 2 changesets (bug 1518512) for devtools failures on devtools/client/inspector/changes/test/browser_changes_rule_selector.js. CLOSED TREE

Backed out changeset c8f0d19844f6 (bug 1518512)
Backed out changeset 3c03e2282b4f (bug 1518512)

devtools/client/inspector/changes/ChangesView.js

@@ -9,8 +9,6 @@
 const { createFactory, createElement } = require("devtools/client/shared/vendor/react");
 const { Provider } = require("devtools/client/shared/vendor/react-redux");
 
-loader.lazyRequireGetter(this, "ChangesContextMenu", "devtools/client/inspector/changes/ChangesContextMenu");
-
 const ChangesApp = createFactory(require("./components/ChangesApp"));
 
 const {
@@ -23,28 +21,18 @@ class ChangesView {
     this.document = window.document;
     this.inspector = inspector;
     this.store = this.inspector.store;
+    this.toolbox = this.inspector.toolbox;
 
     this.onAddChange = this.onAddChange.bind(this);
     this.onClearChanges = this.onClearChanges.bind(this);
     this.onChangesFront = this.onChangesFront.bind(this);
-    this.onContextMenu = this.onContextMenu.bind(this);
     this.destroy = this.destroy.bind(this);
 
     this.init();
   }
 
-  get contextMenu() {
-    if (!this._contextMenu) {
-      this._contextMenu = new ChangesContextMenu(this);
-    }
-
-    return this._contextMenu;
-  }
-
   init() {
-    const changesApp = ChangesApp({
-      onContextMenu: this.onContextMenu,
-    });
+    const changesApp = ChangesApp({});
 
     // listen to the front for initialization, add listeners
     // when it is ready
@@ -100,10 +88,6 @@ class ChangesView {
     this.store.dispatch(resetChanges());
   }
 
-  onContextMenu(e) {
-    this.contextMenu.show(e);
-  }
-
   /**
    * Destruction function called when the inspector is destroyed.
    */
@@ -118,11 +102,7 @@ class ChangesView {
     this.document = null;
     this.inspector = null;
     this.store = null;
-
-    if (this._contextMenu) {
-      this._contextMenu.destroy();
-      this._contextMenu = null;
-    }
+    this.toolbox = null;
   }
 }