Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(886)

Unified Diff: third_party/WebKit/Source/devtools/front_end/elements/InspectElementModeController.js

Issue 2819183002: [DevTools] Consolidate overlay-related functionality in Overlay domain (Closed)
Patch Set: rebased bad merge Created 3 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: third_party/WebKit/Source/devtools/front_end/elements/InspectElementModeController.js
diff --git a/third_party/WebKit/Source/devtools/front_end/elements/InspectElementModeController.js b/third_party/WebKit/Source/devtools/front_end/elements/InspectElementModeController.js
index 63fe1ceb8d4910313f54482ea6e1e1bbd4c8815a..0eee986d8a3fb33aaf2b674c4f5723e8363f9131 100644
--- a/third_party/WebKit/Source/devtools/front_end/elements/InspectElementModeController.js
+++ b/third_party/WebKit/Source/devtools/front_end/elements/InspectElementModeController.js
@@ -26,46 +26,46 @@
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
/**
- * @implements {SDK.SDKModelObserver<!SDK.DOMModel>}
+ * @implements {SDK.SDKModelObserver<!SDK.OverlayModel>}
* @unrestricted
*/
Elements.InspectElementModeController = class {
constructor() {
this._toggleSearchAction = UI.actionRegistry.action('elements.toggle-element-search');
- this._mode = Protocol.DOM.InspectMode.None;
+ this._mode = Protocol.Overlay.InspectMode.None;
SDK.targetManager.addEventListener(SDK.TargetManager.Events.SuspendStateChanged, this._suspendStateChanged, this);
- SDK.targetManager.observeModels(SDK.DOMModel, this);
+ SDK.targetManager.observeModels(SDK.OverlayModel, this);
}
/**
* @override
- * @param {!SDK.DOMModel} domModel
+ * @param {!SDK.OverlayModel} overlayModel
*/
- modelAdded(domModel) {
+ modelAdded(overlayModel) {
// When DevTools are opening in the inspect element mode, the first target comes in
// much later than the InspectorFrontendAPI.enterInspectElementMode event.
- if (this._mode === Protocol.DOM.InspectMode.None)
+ if (this._mode === Protocol.Overlay.InspectMode.None)
return;
- domModel.setInspectMode(this._mode);
+ overlayModel.setInspectMode(this._mode);
}
/**
* @override
- * @param {!SDK.DOMModel} domModel
+ * @param {!SDK.OverlayModel} overlayModel
*/
- modelRemoved(domModel) {
+ modelRemoved(overlayModel) {
}
/**
* @return {boolean}
*/
isInInspectElementMode() {
- return this._mode === Protocol.DOM.InspectMode.SearchForNode ||
- this._mode === Protocol.DOM.InspectMode.SearchForUAShadowDOM;
+ return this._mode === Protocol.Overlay.InspectMode.SearchForNode ||
+ this._mode === Protocol.Overlay.InspectMode.SearchForUAShadowDOM;
}
stopInspection() {
- if (this._mode && this._mode !== Protocol.DOM.InspectMode.None)
+ if (this._mode && this._mode !== Protocol.Overlay.InspectMode.None)
this._toggleInspectMode();
}
@@ -75,22 +75,22 @@ Elements.InspectElementModeController = class {
var mode;
if (this.isInInspectElementMode()) {
- mode = Protocol.DOM.InspectMode.None;
+ mode = Protocol.Overlay.InspectMode.None;
} else {
- mode = Common.moduleSetting('showUAShadowDOM').get() ? Protocol.DOM.InspectMode.SearchForUAShadowDOM :
- Protocol.DOM.InspectMode.SearchForNode;
+ mode = Common.moduleSetting('showUAShadowDOM').get() ? Protocol.Overlay.InspectMode.SearchForUAShadowDOM :
+ Protocol.Overlay.InspectMode.SearchForNode;
}
this._setMode(mode);
}
/**
- * @param {!Protocol.DOM.InspectMode} mode
+ * @param {!Protocol.Overlay.InspectMode} mode
*/
_setMode(mode) {
this._mode = mode;
- for (var domModel of SDK.targetManager.models(SDK.DOMModel))
- domModel.setInspectMode(mode);
+ for (var overlayModel of SDK.targetManager.models(SDK.OverlayModel))
+ overlayModel.setInspectMode(mode);
this._toggleSearchAction.setToggled(this.isInInspectElementMode());
}
@@ -98,7 +98,7 @@ Elements.InspectElementModeController = class {
if (!SDK.targetManager.allTargetsSuspended())
return;
- this._mode = Protocol.DOM.InspectMode.None;
+ this._mode = Protocol.Overlay.InspectMode.None;
this._toggleSearchAction.setToggled(false);
}
};

Powered by Google App Engine
This is Rietveld 408576698