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

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

Issue 2417073002: Timeline: get layers panel out of experiment (Closed)
Patch Set: rebased Created 4 years 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 | « no previous file | third_party/WebKit/Source/devtools/front_end/layers/module.json » ('j') | 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 157 matching lines...) Expand 10 before | Expand all | Expand 10 after
168 .concat(UI.shortcutRegistry.shortcutDescriptorsForAction('timeline.j ump-to-next-frame')), 168 .concat(UI.shortcutRegistry.shortcutDescriptorsForAction('timeline.j ump-to-next-frame')),
169 Common.UIString('Jump to previous/next frame')); 169 Common.UIString('Jump to previous/next frame'));
170 170
171 // Profiles panel 171 // Profiles panel
172 section = Components.shortcutsScreen.section(Common.UIString('Profiles Panel ')); 172 section = Components.shortcutsScreen.section(Common.UIString('Profiles Panel '));
173 section.addAlternateKeys( 173 section.addAlternateKeys(
174 UI.shortcutRegistry.shortcutDescriptorsForAction('profiler.toggle-record ing'), 174 UI.shortcutRegistry.shortcutDescriptorsForAction('profiler.toggle-record ing'),
175 Common.UIString('Start/stop recording')); 175 Common.UIString('Start/stop recording'));
176 176
177 // Layers panel 177 // Layers panel
178 if (Runtime.experiments.isEnabled('layersPanel')) { 178 section = Components.shortcutsScreen.section(Common.UIString('Layers Panel') );
179 section = Components.shortcutsScreen.section(Common.UIString('Layers Panel ')); 179 section.addAlternateKeys(Components.ShortcutsScreen.LayersPanelShortcuts.Res etView, Common.UIString('Reset view'));
180 section.addAlternateKeys( 180 section.addAlternateKeys(
181 Components.ShortcutsScreen.LayersPanelShortcuts.ResetView, Common.UISt ring('Reset view')); 181 Components.ShortcutsScreen.LayersPanelShortcuts.PanMode, Common.UIString ('Switch to pan mode'));
182 section.addAlternateKeys( 182 section.addAlternateKeys(
183 Components.ShortcutsScreen.LayersPanelShortcuts.PanMode, Common.UIStri ng('Switch to pan mode')); 183 Components.ShortcutsScreen.LayersPanelShortcuts.RotateMode, Common.UIStr ing('Switch to rotate mode'));
184 section.addAlternateKeys( 184 section.addAlternateKeys(
185 Components.ShortcutsScreen.LayersPanelShortcuts.RotateMode, Common.UIS tring('Switch to rotate mode')); 185 Components.ShortcutsScreen.LayersPanelShortcuts.TogglePanRotate,
186 section.addAlternateKeys( 186 Common.UIString('Temporarily toggle pan/rotate mode while held'));
187 Components.ShortcutsScreen.LayersPanelShortcuts.TogglePanRotate, 187 section.addAlternateKeys(Components.ShortcutsScreen.LayersPanelShortcuts.Zoo mIn, Common.UIString('Zoom in'));
188 Common.UIString('Temporarily toggle pan/rotate mode while held')); 188 section.addAlternateKeys(Components.ShortcutsScreen.LayersPanelShortcuts.Zoo mOut, Common.UIString('Zoom out'));
189 section.addAlternateKeys(Components.ShortcutsScreen.LayersPanelShortcuts.Z oomIn, Common.UIString('Zoom in')); 189 section.addRelatedKeys(
190 section.addAlternateKeys(Components.ShortcutsScreen.LayersPanelShortcuts.Z oomOut, Common.UIString('Zoom out')); 190 Components.ShortcutsScreen.LayersPanelShortcuts.Up.concat(Components.Sho rtcutsScreen.LayersPanelShortcuts.Down),
191 section.addRelatedKeys( 191 Common.UIString('Pan or rotate up/down'));
192 Components.ShortcutsScreen.LayersPanelShortcuts.Up.concat( 192 section.addRelatedKeys(
193 Components.ShortcutsScreen.LayersPanelShortcuts.Down), 193 Components.ShortcutsScreen.LayersPanelShortcuts.Left.concat(
194 Common.UIString('Pan or rotate up/down')); 194 Components.ShortcutsScreen.LayersPanelShortcuts.Right),
195 section.addRelatedKeys( 195 Common.UIString('Pan or rotate left/right'));
196 Components.ShortcutsScreen.LayersPanelShortcuts.Left.concat(
197 Components.ShortcutsScreen.LayersPanelShortcuts.Right),
198 Common.UIString('Pan or rotate left/right'));
199 }
200 } 196 }
201 197
202 /** 198 /**
203 * @param {string} name 199 * @param {string} name
204 * @return {!Components.ShortcutsSection} 200 * @return {!Components.ShortcutsSection}
205 */ 201 */
206 section(name) { 202 section(name) {
207 var section = this._sections[name]; 203 var section = this._sections[name];
208 if (!section) 204 if (!section)
209 this._sections[name] = section = new Components.ShortcutsSection(name); 205 this._sections[name] = section = new Components.ShortcutsSection(name);
(...skipping 273 matching lines...) Expand 10 before | Expand all | Expand 10 after
483 ], 479 ],
484 480
485 Up: [UI.KeyboardShortcut.makeDescriptor(UI.KeyboardShortcut.Keys.Up), UI.Keybo ardShortcut.makeDescriptor('w')], 481 Up: [UI.KeyboardShortcut.makeDescriptor(UI.KeyboardShortcut.Keys.Up), UI.Keybo ardShortcut.makeDescriptor('w')],
486 482
487 Down: [UI.KeyboardShortcut.makeDescriptor(UI.KeyboardShortcut.Keys.Down), UI.K eyboardShortcut.makeDescriptor('s')], 483 Down: [UI.KeyboardShortcut.makeDescriptor(UI.KeyboardShortcut.Keys.Down), UI.K eyboardShortcut.makeDescriptor('s')],
488 484
489 Left: [UI.KeyboardShortcut.makeDescriptor(UI.KeyboardShortcut.Keys.Left), UI.K eyboardShortcut.makeDescriptor('a')], 485 Left: [UI.KeyboardShortcut.makeDescriptor(UI.KeyboardShortcut.Keys.Left), UI.K eyboardShortcut.makeDescriptor('a')],
490 486
491 Right: [UI.KeyboardShortcut.makeDescriptor(UI.KeyboardShortcut.Keys.Right), UI .KeyboardShortcut.makeDescriptor('d')] 487 Right: [UI.KeyboardShortcut.makeDescriptor(UI.KeyboardShortcut.Keys.Right), UI .KeyboardShortcut.makeDescriptor('d')]
492 }; 488 };
OLDNEW
« no previous file with comments | « no previous file | third_party/WebKit/Source/devtools/front_end/layers/module.json » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698