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

Unified Diff: Source/devtools/front_end/components/InspectElementModeController.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
« no previous file with comments | « Source/core/inspector/InspectorDOMAgent.cpp ('k') | Source/devtools/front_end/elements/ElementsPanel.js » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/devtools/front_end/components/InspectElementModeController.js
diff --git a/Source/devtools/front_end/components/InspectElementModeController.js b/Source/devtools/front_end/components/InspectElementModeController.js
index 87ef22f29ca9906747d771339adc647aae8ef8f3..f0d3d766f48c230228e1e2a97e7d292a5de5b99e 100644
--- a/Source/devtools/front_end/components/InspectElementModeController.js
+++ b/Source/devtools/front_end/components/InspectElementModeController.js
@@ -58,7 +58,7 @@ WebInspector.InspectElementModeController.prototype = {
if (!this.enabled())
return;
var domModel = WebInspector.DOMModel.fromTarget(target);
- domModel.setInspectModeEnabled(true, WebInspector.moduleSetting("showUAShadowDOM").get());
+ domModel.setInspectMode(WebInspector.moduleSetting("showUAShadowDOM").get() ? DOMAgent.InspectMode.SearchForUAShadowDOM : DOMAgent.InspectMode.SearchForNode);
},
/**
@@ -88,8 +88,17 @@ WebInspector.InspectElementModeController.prototype = {
var enabled = !this.enabled();
this._toggleSearchButton.setToggled(enabled);
- for (var domModel of WebInspector.DOMModel.instances())
- domModel.setInspectModeEnabled(enabled, WebInspector.moduleSetting("showUAShadowDOM").get());
+ for (var domModel of WebInspector.DOMModel.instances()) {
+ var mode;
+ if (!enabled)
+ mode = DOMAgent.InspectMode.None;
+ else if (WebInspector.moduleSetting("showUAShadowDOM").get())
+ mode = DOMAgent.InspectMode.SearchForUAShadowDOM;
+ else
+ mode = DOMAgent.InspectMode.SearchForNode;
+
+ domModel.setInspectMode(mode);
+ }
},
_suspendStateChanged: function()
« no previous file with comments | « Source/core/inspector/InspectorDOMAgent.cpp ('k') | Source/devtools/front_end/elements/ElementsPanel.js » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698