| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright (C) 2009 Google Inc. All rights reserved. | 2 * Copyright (C) 2009 Google Inc. All rights reserved. |
| 3 * | 3 * |
| 4 * Redistribution and use in source and binary forms, with or without | 4 * Redistribution and use in source and binary forms, with or without |
| 5 * modification, are permitted provided that the following conditions are | 5 * modification, are permitted provided that the following conditions are |
| 6 * met: | 6 * met: |
| 7 * | 7 * |
| 8 * * Redistributions of source code must retain the above copyright | 8 * * Redistributions of source code must retain the above copyright |
| 9 * notice, this list of conditions and the following disclaimer. | 9 * notice, this list of conditions and the following disclaimer. |
| 10 * * Redistributions in binary form must reproduce the above | 10 * * Redistributions in binary form must reproduce the above |
| (...skipping 692 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 703 var breakpointsSetting = Common.settings.createLocalSetting('breakpoints', [
]); | 703 var breakpointsSetting = Common.settings.createLocalSetting('breakpoints', [
]); |
| 704 var breakpoints = breakpointsSetting.get(); | 704 var breakpoints = breakpointsSetting.get(); |
| 705 for (var breakpoint of breakpoints) { | 705 for (var breakpoint of breakpoints) { |
| 706 breakpoint['url'] = breakpoint['sourceFileId']; | 706 breakpoint['url'] = breakpoint['sourceFileId']; |
| 707 delete breakpoint['sourceFileId']; | 707 delete breakpoint['sourceFileId']; |
| 708 } | 708 } |
| 709 breakpointsSetting.set(breakpoints); | 709 breakpointsSetting.set(breakpoints); |
| 710 } | 710 } |
| 711 | 711 |
| 712 _updateVersionFrom22To23() { | 712 _updateVersionFrom22To23() { |
| 713 var oldSetting = Common.settings.createSetting('consoleTimestampsEnabled', f
alse); | 713 // This update is no-op. |
| 714 var newSetting = Common.settings.createSetting('consoleTimestampFormat', 'no
ne'); | |
| 715 var oldValue = oldSetting.get(); | |
| 716 if (oldValue) | |
| 717 newSetting.set('short'); | |
| 718 oldSetting.remove(); | |
| 719 } | 714 } |
| 720 | 715 |
| 721 _migrateSettingsFromLocalStorage() { | 716 _migrateSettingsFromLocalStorage() { |
| 722 // This step migrates all the settings except for the ones below into the br
owser profile. | 717 // This step migrates all the settings except for the ones below into the br
owser profile. |
| 723 var localSettings = new Set([ | 718 var localSettings = new Set([ |
| 724 'advancedSearchConfig', 'breakpoints', 'consoleHistory', 'domBreakpoints',
'eventListenerBreakpoints', | 719 'advancedSearchConfig', 'breakpoints', 'consoleHistory', 'domBreakpoints',
'eventListenerBreakpoints', |
| 725 'fileSystemMapping', 'lastSelectedSourcesSidebarPaneTab', 'previouslyViewe
dFiles', 'savedURLs', | 720 'fileSystemMapping', 'lastSelectedSourcesSidebarPaneTab', 'previouslyViewe
dFiles', 'savedURLs', |
| 726 'watchExpressions', 'workspaceExcludedFolders', 'xhrBreakpoints' | 721 'watchExpressions', 'workspaceExcludedFolders', 'xhrBreakpoints' |
| 727 ]); | 722 ]); |
| 728 if (!window.localStorage) | 723 if (!window.localStorage) |
| (...skipping 36 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 765 return Common.settings.moduleSetting(settingName); | 760 return Common.settings.moduleSetting(settingName); |
| 766 }; | 761 }; |
| 767 | 762 |
| 768 /** | 763 /** |
| 769 * @param {string} settingName | 764 * @param {string} settingName |
| 770 * @return {!Common.Setting} | 765 * @return {!Common.Setting} |
| 771 */ | 766 */ |
| 772 Common.settingForTest = function(settingName) { | 767 Common.settingForTest = function(settingName) { |
| 773 return Common.settings.settingForTest(settingName); | 768 return Common.settings.settingForTest(settingName); |
| 774 }; | 769 }; |
| OLD | NEW |