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

Side by Side Diff: chrome/test/data/extensions/api_test/keybinding/conflicting/manifest.json

Issue 10201016: Conflict detection for Extension Keybinding. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Addressed comments Created 8 years, 7 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 | Annotate | Revision Log
« no previous file with comments | « chrome/test/data/extensions/api_test/keybinding/conflicting/background.js ('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
(Empty)
1 {
2 "name": "Conflicting keybinding test, duplicate of Basics extension (dir next to this), but uses different colors",
3 "version": "1.0",
4 "manifest_version": 2,
5 "background": {
6 "scripts": ["background.js"]
7 },
8 "permissions": [
9 "tabs", "http://*/*", "experimental", "keybinding"
10 ],
11 "browser_action": {
12 "default_title": "Make this page green"
13 },
14 "commands": {
15 "toggle-feature": {
16 "suggested_key": {
17 "windows": "Ctrl+Shift+Y",
18 "mac": "Command+Shift+Y",
19 "linux": "Ctrl+Shift+Y",
20 "chromeos": "Ctrl+Shift+Y",
21 "default": "Ctrl+Shift+Y"
22 },
23 "description": "Toggle feature foo"
24 },
25 "_execute_browser_action": {
26 "suggested_key": {
27 "mac": "Command+Shift+F",
28 "default": "Ctrl+Shift+F"
29 }
30 }
31 }
32 }
OLDNEW
« no previous file with comments | « chrome/test/data/extensions/api_test/keybinding/conflicting/background.js ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698