DevTools: migrate InspectorView to tabbed view location.

third_party/WebKit/Source/devtools/front_end/common/Settings.js

 /*
  * Copyright (C) 2009 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 381 matching lines @@
 }
 
 /**
  * @constructor
  */
 WebInspector.VersionController = function()
 {
 }
 
 WebInspector.VersionController._currentVersionName = "inspectorVersion";
-WebInspector.VersionController.currentVersion = 19;
+WebInspector.VersionController.currentVersion = 20;
 
 WebInspector.VersionController.prototype = {
     updateVersion: function()
     {
         var localStorageVersion = window.localStorage ? window.localStorage[WebInspector.VersionController._currentVersionName] : 0;
         var versionSetting = WebInspector.settings.createSetting(WebInspector.VersionController._currentVersionName, 0);
         var currentVersion = WebInspector.VersionController.currentVersion;
-        // While localStorage version exists, treat it as the main one. It'll be erased once migrated to prefs.
-        var oldVersion = parseInt(localStorageVersion || "0", 10) || versionSetting.get();
+        var oldVersion = versionSetting.get() || parseInt(localStorageVersion || "0", 10);
         if (oldVersion === 0) {
             // First run, no need to do anything.
             versionSetting.set(currentVersion);
             return;
         }
         var methodsToRun = this._methodsToRunToUpdateVersion(oldVersion, currentVersion);
         for (var i = 0; i < methodsToRun.length; ++i)
             this[methodsToRun[i]].call(this);
         versionSetting.set(currentVersion);
     },
@@ skipping 298 matching lines @@
                 continue;
             configs[columnId.toLowerCase()] = {
                 visible: visibleColumns[columnId]
             };
         }
         var newSetting = WebInspector.settings.createSetting("networkLogColumns", {});
         newSetting.set(configs);
         visibleColumnSettings.remove();
     },
 
+    _updateVersionFrom19To20: function()
+    {
+        var oldSetting = WebInspector.settings.createSetting("InspectorView.panelOrder", {});
+        var newSetting = WebInspector.settings.createSetting("panel-tabOrder", {});
+        newSetting.set(oldSetting.get());
+        oldSetting.remove();
+    },
+
     _migrateSettingsFromLocalStorage: function()
     {
         // This step migrates all the settings except for the ones below into the browser profile.
         var localSettings = new Set([ "advancedSearchConfig", "breakpoints", "consoleHistory", "domBreakpoints", "eventListenerBreakpoints",
                               "fileSystemMapping", "lastSelectedSourcesSidebarPaneTab", "previouslyViewedFiles",
                               "savedURLs", "watchExpressions", "workspaceExcludedFolders", "xhrBreakpoints" ]);
         if (!window.localStorage)
             return;
 
         for (var key in window.localStorage) {
@@ skipping 33 matching lines @@
 }
 
 /**
  * @param {string} settingName
  * @return {!WebInspector.Setting}
  */
 WebInspector.settingForTest = function(settingName)
 {
     return WebInspector.settings.settingForTest(settingName);
 }