Chromium Code Reviews| 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..90db1625db4f23cba1e7d863f6eeffb0e183cc42 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.SearchForNormal); |
| } |
| 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) |
|
dgozman
2015/08/29 01:36:40
!==
sergeyv
2015/08/29 02:03:44
Done.
|
| return; |
| var selectedNode = this._treeOutline.selectedDOMNode(); |