[DevTools] Restore show rulers functionality.

This was regressed by device mode cleanup. BUG=588523 Review URL: https://codereview.chromium.org/1719173002 Cr-Commit-Position: refs/heads/master@{#376792}
binaryage · Feb 22, 2016 · 9ae3c2c · 9ae3c2c
1 parent 97f87ca
commit 9ae3c2c
Show file tree

Hide file tree

Showing 5 changed files with 33 additions and 22 deletions.
diff --git a/front_end/elements/module.json b/front_end/elements/module.json
@@ -55,15 +55,6 @@
             "settingType": "boolean",
             "defaultValue": true
         },
-        {
-            "type": "setting",
-            "category": "Elements",
-            "order": 3,
-            "title": "Show rulers",
-            "settingName": "showMetricsRulers",
-            "settingType": "boolean",
-            "defaultValue": false
-        },
         {
             "type": "setting",
             "category": "Elements",

diff --git a/front_end/main/Main.js b/front_end/main/Main.js
@@ -1115,4 +1115,24 @@ WebInspector.AutoAttachToCreatedPagesSync.prototype = {
     }
 }
 
+/**
+ * @constructor
+ * @implements {WebInspector.SettingUI}
+ */
+WebInspector.ShowMetricsRulersSettingUI = function()
+{
+}
+
+WebInspector.ShowMetricsRulersSettingUI.prototype = {
+    /**
+     * @override
+     * @return {?Element}
+     */
+    settingElement: function()
+    {
+        return WebInspector.SettingsUI.createSettingCheckbox(WebInspector.UIString("Show rulers"), WebInspector.moduleSetting("showMetricsRulers"));
+    }
+}
+
+
 new WebInspector.Main();
diff --git a/front_end/main/module.json b/front_end/main/module.json
@@ -287,6 +287,12 @@
             "category": "Extensions",
             "className": "WebInspector.HandlerRegistry.OpenAnchorLocationSettingUI"
         },
+        {
+            "type": "@WebInspector.SettingUI",
+            "category": "Elements",
+            "order": 3,
+            "className": "WebInspector.ShowMetricsRulersSettingUI"
+        },
         {
             "type": "context-menu-item",
             "location": "mainMenu/navigate",

diff --git a/front_end/sdk/DOMModel.js b/front_end/sdk/DOMModel.js
@@ -1084,8 +1084,6 @@ WebInspector.DOMModel = function(target) {
     this._attributeLoadNodeIds = {};
     target.registerDOMDispatcher(new WebInspector.DOMDispatcher(this));
 
-    this._showRulers = false;
-    this._showExtensionLines = false;
     this._inspectModeEnabled = false;
 
     this._defaultHighlighter = new WebInspector.DefaultDOMNodeHighlighter(this._agent);
@@ -1802,24 +1800,14 @@ WebInspector.DOMModel.prototype = {
         return this._inspectModeEnabled;
     },
 
-    /**
-     * @param {boolean} showRulers
-     * @param {boolean} showExtensionLines
-     */
-    setHighlightSettings: function(showRulers, showExtensionLines)
-    {
-        this._showRulers = showRulers;
-        this._showExtensionLines = showExtensionLines;
-    },
-
     /**
      * @param {string=} mode
      * @return {!DOMAgent.HighlightConfig}
      */
     _buildHighlightConfig: function(mode)
     {
         mode = mode || "all";
-        var highlightConfig = { showInfo: mode === "all", showRulers: this._showRulers, showExtensionLines: this._showExtensionLines };
+        var highlightConfig = { showInfo: mode === "all", showRulers: WebInspector.moduleSetting("showMetricsRulers").get(), showExtensionLines: true };
         if (mode === "all" || mode === "content")
             highlightConfig.contentColor = WebInspector.Color.PageHighlight.Content.toProtocolRGBA();
 

diff --git a/front_end/sdk/module.json b/front_end/sdk/module.json
@@ -40,6 +40,12 @@
             "settingName": "enableAsyncStackTraces",
             "settingType": "boolean",
             "defaultValue": false
+        },
+        {
+            "type": "setting",
+            "settingName": "showMetricsRulers",
+            "settingType": "boolean",
+            "defaultValue": false
         }
     ],
     "scripts": [