DevTools: migrate InspectorView to tabbed view location.

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

Index: third_party/WebKit/Source/devtools/front_end/common/Settings.js
diff --git a/third_party/WebKit/Source/devtools/front_end/common/Settings.js b/third_party/WebKit/Source/devtools/front_end/common/Settings.js
index 5c4f0484cafd46817c4153c0b125c733981a9167..ad2e6ccc849077f2852618c4c0951d1c9d787c69 100644
--- a/third_party/WebKit/Source/devtools/front_end/common/Settings.js
+++ b/third_party/WebKit/Source/devtools/front_end/common/Settings.js
@@ -399,7 +399,7 @@ WebInspector.VersionController = function()
 }
 
 WebInspector.VersionController._currentVersionName = "inspectorVersion";
-WebInspector.VersionController.currentVersion = 19;
+WebInspector.VersionController.currentVersion = 20;
 
 WebInspector.VersionController.prototype = {
     updateVersion: function()
@@ -407,8 +407,7 @@ WebInspector.VersionController.prototype = {
         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);
@@ -727,6 +726,14 @@ WebInspector.VersionController.prototype = {
         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.