DevTools: introduce view locations, allow opening views by id.

third_party/WebKit/Source/devtools/front_end/settings/SettingsScreen.js

 /*
  * Copyright (C) 2013 Google Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are
  * met:
  *
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
  *     * Redistributions in binary form must reproduce the above
@@ skipping 13 matching lines @@
  * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
  * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
  * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
 /**
  * @constructor
  * @extends {WebInspector.VBox}
+ * @implements {WebInspector.ViewLocationResolver}
  */
 WebInspector.SettingsScreen = function()
 {
     WebInspector.VBox.call(this, true);
     this.registerRequiredCSS("settings/settingsScreen.css");
 
     this.contentElement.tabIndex = 0;
     this.contentElement.classList.add("help-window-main");
     this.contentElement.classList.add("vbox");
     var settingsLabelElement = createElementWithClass("div", "help-window-label");
     settingsLabelElement.createTextChild(WebInspector.UIString("Settings"));
 
     this._extensibleTabbedPane = new WebInspector.ExtensibleTabbedPane("settings-view");
     var tabbedPane = this._extensibleTabbedPane.tabbedPane();
     tabbedPane.insertBeforeTabStrip(settingsLabelElement);
     tabbedPane.setShrinkableTabs(false);
     tabbedPane.setVerticalTabLayout(true);
     tabbedPane.appendTab("shortcuts", WebInspector.UIString("Shortcuts"), WebInspector.shortcutsScreen.createShortcutsTabView());
     this._extensibleTabbedPane.show(this.contentElement);
 
     this.element.addEventListener("keydown", this._keyDown.bind(this), false);
     this._developerModeCounter = 0;
     this.setDefaultFocusedElement(this.contentElement);
 }
 
+/**
+ * @param {string=} name
+ */
+WebInspector.SettingsScreen._showSettingsScreen = function(name)
+{
+    var settingsScreen = /** @type {!WebInspector.SettingsScreen} */ (self.runtime.sharedInstance(WebInspector.SettingsScreen));
+    var dialog = new WebInspector.Dialog();
+    dialog.addCloseButton();
+    settingsScreen.show(dialog.element);
+    settingsScreen.selectTab(name || "preferences");
+    dialog.show();
+}
+
 WebInspector.SettingsScreen.prototype = {
+
+    /**
+     * @override
+     * @param {string} locationName
+     * @return {?WebInspector.ViewLocation}
+     */
+    resolveLocation: function(locationName)

[dgozman, 2016/08/03 19:18:18]

I thought we agreed on revealLocation.

[pfeldman, 2016/08/03 21:52:18]

I'll follow up in the subsequent patch.

+    {
+        WebInspector.SettingsScreen._showSettingsScreen();
+        return this._extensibleTabbedPane;
+    },
+
     /**
      * @param {string} name
      */
     selectTab: function(name)
     {
-        this._extensibleTabbedPane.showTab(name);
+        this._extensibleTabbedPane.showView(name);
     },
 
     /**
      * @param {!Event} event
      */
     _keyDown: function(event)
     {
         var shiftKeyCode = 16;
         if (event.keyCode === shiftKeyCode && ++this._developerModeCounter > 5)
             this.contentElement.classList.add("settings-developer-mode");
@@ skipping 373 matching lines @@
         p.className = experiment.hidden && !experiment.isEnabled() ? "settings-experiment-hidden" : "";
         p.appendChild(label);
         return p;
     },
 
     __proto__: WebInspector.SettingsTab.prototype
 }
 
 /**
  * @constructor
- */
-WebInspector.SettingsController = function()
-{
-    /** @type {?WebInspector.SettingsScreen} */
-    this._settingsScreen;
-}
-
-WebInspector.SettingsController.prototype = {
-    /**
-     * @param {string=} name
-     */
-    showSettingsScreen: function(name)
-    {
-        if (!this._settingsScreen)
-            this._settingsScreen = new WebInspector.SettingsScreen();
-
-        var dialog = new WebInspector.Dialog();
-        dialog.addCloseButton();
-        this._settingsScreen.show(dialog.element);
-        this._settingsScreen.selectTab(name || "preferences");
-        dialog.show();
-    }
-}
-
-/**
- * @constructor
  * @implements {WebInspector.ActionDelegate}
  */
-WebInspector.SettingsController.ActionDelegate = function() { }
+WebInspector.SettingsScreen.ActionDelegate = function() { }
 
-WebInspector.SettingsController.ActionDelegate.prototype = {
+WebInspector.SettingsScreen.ActionDelegate.prototype = {
     /**
      * @override
      * @param {!WebInspector.Context} context
      * @param {string} actionId
      * @return {boolean}
      */
     handleAction: function(context, actionId)
     {
         switch (actionId) {
         case "settings.show":
-            WebInspector._settingsController.showSettingsScreen();
+            WebInspector.SettingsScreen._showSettingsScreen();
             return true;
         case "settings.help":
             InspectorFrontendHost.openInNewTab("https://developers.google.com/web/tools/chrome-devtools/");
             return true;
         case "settings.shortcuts":
-            WebInspector._settingsController.showSettingsScreen("shortcuts");
+            WebInspector.SettingsScreen._showSettingsScreen("shortcuts");
             return true;
         }
         return false;
     }
 }
 
 /**
  * @constructor
  * @implements {WebInspector.Revealer}
  */
-WebInspector.SettingsController.Revealer = function() { }
+WebInspector.SettingsScreen.Revealer = function() { }
 
-WebInspector.SettingsController.Revealer.prototype = {
+WebInspector.SettingsScreen.Revealer.prototype = {
     /**
      * @override
      * @param {!Object} object
      * @return {!Promise}
      */
     reveal: function(object)
     {
         console.assert(object instanceof WebInspector.Setting);
         var setting = /** @type {!WebInspector.Setting} */ (object);
         var success = false;
 
         self.runtime.extensions("setting").forEach(revealModuleSetting);
         self.runtime.extensions(WebInspector.SettingUI).forEach(revealSettingUI);
         self.runtime.extensions("view").forEach(revealSettingsView);
 
         return success ? Promise.resolve() : Promise.reject();
 
         /**
          * @param {!Runtime.Extension} extension
          */
         function revealModuleSetting(extension)
         {
             if (!WebInspector.GenericSettingsTab.isSettingVisible(extension))
                 return;
             if (extension.descriptor()["settingName"] === setting.name) {
                 InspectorFrontendHost.bringToFront();
-                WebInspector._settingsController.showSettingsScreen("preferences");
+                WebInspector.SettingsScreen._showSettingsScreen();
                 success = true;
             }
         }
 
         /**
          * @param {!Runtime.Extension} extension
          */
         function revealSettingUI(extension)
         {
             var settings = extension.descriptor()["settings"];
             if (settings && settings.indexOf(setting.name) !== -1) {
                 InspectorFrontendHost.bringToFront();
-                WebInspector._settingsController.showSettingsScreen("preferences");
+                WebInspector.SettingsScreen._showSettingsScreen();
                 success = true;
             }
         }
 
         /**
          * @param {!Runtime.Extension} extension
          */
         function revealSettingsView(extension)
         {
             var location = extension.descriptor()["location"];
             if (location !== "settings-view")
                 return;
             var settings = extension.descriptor()["settings"];
             if (settings && settings.indexOf(setting.name) !== -1) {
                 InspectorFrontendHost.bringToFront();
-                WebInspector._settingsController.showSettingsScreen(extension.descriptor()["name"]);
+                WebInspector.SettingsScreen._showSettingsScreen(extension.descriptor()["id"]);
                 success = true;
             }
         }
     }
 }
-
-WebInspector._settingsController = new WebInspector.SettingsController();