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

Unified Diff: Source/devtools/front_end/elements/ElementsPanel.js

Issue 1310273006: Devtools: convert pair of booleans in setInspectModeEnabled into enum parameter (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Address comments Created 5 years, 4 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: Source/devtools/front_end/elements/ElementsPanel.js
diff --git a/Source/devtools/front_end/elements/ElementsPanel.js b/Source/devtools/front_end/elements/ElementsPanel.js
index b11fcdf71827008af2200c0dfb54de8e49d3c3ad..b74f5a76fd04f5cf2b7b33646b95fee5444ddb7b 100644
--- a/Source/devtools/front_end/elements/ElementsPanel.js
+++ b/Source/devtools/front_end/elements/ElementsPanel.js
@@ -1116,7 +1116,7 @@ WebInspector.ElementsPanel.prototype = {
// We need to correct (turn on/off layout editor) the config which is used by inspect element mode, so we re-enable it.
if (WebInspector.inspectElementModeController && WebInspector.inspectElementModeController.enabled())
- domModel.setInspectModeEnabled(true, WebInspector.moduleSetting("showUAShadowDOM").get());
+ domModel.setInspectMode(WebInspector.moduleSetting("showUAShadowDOM").get() ? DOMAgent.InspectMode.SearchForUAShadowDOM : DOMAgent.InspectMode.SearchForNode);
}
WebInspector.DOMModel.hideDOMNodeHighlight();
},
@@ -1333,17 +1333,16 @@ WebInspector.ElementsPanel.LayoutEditorNodeHighlighter.prototype = {
/**
* @override
- * @param {boolean} enabled
- * @param {boolean} inspectUAShadowDOM
+ * @param {!DOMAgent.InspectMode} mode
* @param {!DOMAgent.HighlightConfig} config
* @param {function(?Protocol.Error)=} callback
*/
- setInspectModeEnabled: function(enabled, inspectUAShadowDOM, config, callback)
+ setInspectMode: function(mode, config, callback)
{
config.showLayoutEditor = config.showInfo;
- WebInspector.DefaultDOMNodeHighlighter.prototype.setInspectModeEnabled.call(this, enabled, inspectUAShadowDOM, config, callback);
+ WebInspector.DefaultDOMNodeHighlighter.prototype.setInspectMode.call(this, mode, config, callback);
- if (enabled)
+ if (mode !== DOMAgent.InspectMode.None)
return;
var selectedNode = this._treeOutline.selectedDOMNode();

Powered by Google App Engine
This is Rietveld 408576698