Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(505)

Side by Side Diff: third_party/WebKit/Source/devtools/front_end/ui/ShortcutsScreen.js

Issue 2657893002: DevTools: temporarily revert Timeline->Performance rename. (Closed)
Patch Set: Introduce progress monitor Created 3 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « third_party/WebKit/Source/devtools/front_end/timeline/module.json ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 /* 1 /*
2 * Copyright (C) 2010 Google Inc. All rights reserved. 2 * Copyright (C) 2010 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 123 matching lines...) Expand 10 before | Expand all | Expand 10 after
134 section.addAlternateKeys(UI.ShortcutsScreen.SourcesPanelShortcuts.SoftUndo, Common.UIString('Soft undo')); 134 section.addAlternateKeys(UI.ShortcutsScreen.SourcesPanelShortcuts.SoftUndo, Common.UIString('Soft undo'));
135 section.addAlternateKeys( 135 section.addAlternateKeys(
136 UI.ShortcutsScreen.SourcesPanelShortcuts.GotoMatchingBracket, Common.UIS tring('Go to matching bracket')); 136 UI.ShortcutsScreen.SourcesPanelShortcuts.GotoMatchingBracket, Common.UIS tring('Go to matching bracket'));
137 section.addAlternateKeys( 137 section.addAlternateKeys(
138 UI.ShortcutsScreen.SourcesPanelShortcuts.CloseEditorTab, Common.UIString ('Close editor tab')); 138 UI.ShortcutsScreen.SourcesPanelShortcuts.CloseEditorTab, Common.UIString ('Close editor tab'));
139 section.addAlternateKeys( 139 section.addAlternateKeys(
140 UI.shortcutRegistry.shortcutDescriptorsForAction('sources.switch-file'), 140 UI.shortcutRegistry.shortcutDescriptorsForAction('sources.switch-file'),
141 Common.UIString('Switch between files with the same name and different e xtensions.')); 141 Common.UIString('Switch between files with the same name and different e xtensions.'));
142 142
143 // Performance panel 143 // Performance panel
144 section = UI.shortcutsScreen.section(Common.UIString('Performance Panel')); 144 section = UI.shortcutsScreen.section(Common.UIString('Timeline Panel'));
145 section.addAlternateKeys( 145 section.addAlternateKeys(
146 UI.shortcutRegistry.shortcutDescriptorsForAction('timeline.toggle-record ing'), 146 UI.shortcutRegistry.shortcutDescriptorsForAction('timeline.toggle-record ing'),
147 Common.UIString('Start/stop recording')); 147 Common.UIString('Start/stop recording'));
148 section.addAlternateKeys( 148 section.addAlternateKeys(
149 UI.shortcutRegistry.shortcutDescriptorsForAction('main.reload'), Common. UIString('Record page reload')); 149 UI.shortcutRegistry.shortcutDescriptorsForAction('main.reload'), Common. UIString('Record page reload'));
150 section.addAlternateKeys( 150 section.addAlternateKeys(
151 UI.shortcutRegistry.shortcutDescriptorsForAction('timeline.save-to-file' ), Common.UIString('Save profile')); 151 UI.shortcutRegistry.shortcutDescriptorsForAction('timeline.save-to-file' ), Common.UIString('Save profile'));
152 section.addAlternateKeys( 152 section.addAlternateKeys(
153 UI.shortcutRegistry.shortcutDescriptorsForAction('timeline.load-from-fil e'), Common.UIString('Load profile')); 153 UI.shortcutRegistry.shortcutDescriptorsForAction('timeline.load-from-fil e'), Common.UIString('Load profile'));
154 section.addRelatedKeys( 154 section.addRelatedKeys(
155 UI.shortcutRegistry.shortcutDescriptorsForAction('timeline.jump-to-previ ous-frame') 155 UI.shortcutRegistry.shortcutDescriptorsForAction('timeline.jump-to-previ ous-frame')
156 .concat(UI.shortcutRegistry.shortcutDescriptorsForAction('timeline.j ump-to-next-frame')), 156 .concat(UI.shortcutRegistry.shortcutDescriptorsForAction('timeline.j ump-to-next-frame')),
157 Common.UIString('Jump to previous/next frame')); 157 Common.UIString('Jump to previous/next frame'));
158 158
159 // Memory panel 159 // Memory panel
160 section = UI.shortcutsScreen.section(Common.UIString('Memory Panel')); 160 section = UI.shortcutsScreen.section(Common.UIString('Profiles Panel'));
161 section.addAlternateKeys( 161 section.addAlternateKeys(
162 UI.shortcutRegistry.shortcutDescriptorsForAction('profiler.heap-toggle-r ecording'), 162 UI.shortcutRegistry.shortcutDescriptorsForAction('profiler.heap-toggle-r ecording'),
163 Common.UIString('Start/stop recording')); 163 Common.UIString('Start/stop recording'));
164 164
165 // Layers panel 165 // Layers panel
166 section = UI.shortcutsScreen.section(Common.UIString('Layers Panel')); 166 section = UI.shortcutsScreen.section(Common.UIString('Layers Panel'));
167 section.addAlternateKeys(UI.ShortcutsScreen.LayersPanelShortcuts.ResetView, Common.UIString('Reset view')); 167 section.addAlternateKeys(UI.ShortcutsScreen.LayersPanelShortcuts.ResetView, Common.UIString('Reset view'));
168 section.addAlternateKeys(UI.ShortcutsScreen.LayersPanelShortcuts.PanMode, Co mmon.UIString('Switch to pan mode')); 168 section.addAlternateKeys(UI.ShortcutsScreen.LayersPanelShortcuts.PanMode, Co mmon.UIString('Switch to pan mode'));
169 section.addAlternateKeys( 169 section.addAlternateKeys(
170 UI.ShortcutsScreen.LayersPanelShortcuts.RotateMode, Common.UIString('Swi tch to rotate mode')); 170 UI.ShortcutsScreen.LayersPanelShortcuts.RotateMode, Common.UIString('Swi tch to rotate mode'));
(...skipping 294 matching lines...) Expand 10 before | Expand all | Expand 10 after
465 ], 465 ],
466 466
467 Up: [UI.KeyboardShortcut.makeDescriptor(UI.KeyboardShortcut.Keys.Up), UI.Keybo ardShortcut.makeDescriptor('w')], 467 Up: [UI.KeyboardShortcut.makeDescriptor(UI.KeyboardShortcut.Keys.Up), UI.Keybo ardShortcut.makeDescriptor('w')],
468 468
469 Down: [UI.KeyboardShortcut.makeDescriptor(UI.KeyboardShortcut.Keys.Down), UI.K eyboardShortcut.makeDescriptor('s')], 469 Down: [UI.KeyboardShortcut.makeDescriptor(UI.KeyboardShortcut.Keys.Down), UI.K eyboardShortcut.makeDescriptor('s')],
470 470
471 Left: [UI.KeyboardShortcut.makeDescriptor(UI.KeyboardShortcut.Keys.Left), UI.K eyboardShortcut.makeDescriptor('a')], 471 Left: [UI.KeyboardShortcut.makeDescriptor(UI.KeyboardShortcut.Keys.Left), UI.K eyboardShortcut.makeDescriptor('a')],
472 472
473 Right: [UI.KeyboardShortcut.makeDescriptor(UI.KeyboardShortcut.Keys.Right), UI .KeyboardShortcut.makeDescriptor('d')] 473 Right: [UI.KeyboardShortcut.makeDescriptor(UI.KeyboardShortcut.Keys.Right), UI .KeyboardShortcut.makeDescriptor('d')]
474 }; 474 };
OLDNEW
« no previous file with comments | « third_party/WebKit/Source/devtools/front_end/timeline/module.json ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698