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

Unified 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, 8 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/test/data/extensions/api_test/keybinding/conflicting/background.js ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/test/data/extensions/api_test/keybinding/conflicting/manifest.json
===================================================================
--- chrome/test/data/extensions/api_test/keybinding/conflicting/manifest.json (revision 0)
+++ chrome/test/data/extensions/api_test/keybinding/conflicting/manifest.json (revision 0)
@@ -0,0 +1,32 @@
+{
+ "name": "Conflicting keybinding test, duplicate of Basics extension (dir next to this), but uses different colors",
+ "version": "1.0",
+ "manifest_version": 2,
+ "background": {
+ "scripts": ["background.js"]
+ },
+ "permissions": [
+ "tabs", "http://*/*", "experimental", "keybinding"
+ ],
+ "browser_action": {
+ "default_title": "Make this page green"
+ },
+ "commands": {
+ "toggle-feature": {
+ "suggested_key": {
+ "windows": "Ctrl+Shift+Y",
+ "mac": "Command+Shift+Y",
+ "linux": "Ctrl+Shift+Y",
+ "chromeos": "Ctrl+Shift+Y",
+ "default": "Ctrl+Shift+Y"
+ },
+ "description": "Toggle feature foo"
+ },
+ "_execute_browser_action": {
+ "suggested_key": {
+ "mac": "Command+Shift+F",
+ "default": "Ctrl+Shift+F"
+ }
+ }
+ }
+}
« 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