Conflict detection for Extension Keybinding.

chrome/test/data/extensions/api_test/keybinding/conflicting/background.js

Index: chrome/test/data/extensions/api_test/keybinding/conflicting/background.js
===================================================================
--- chrome/test/data/extensions/api_test/keybinding/conflicting/background.js	(revision 0)
+++ chrome/test/data/extensions/api_test/keybinding/conflicting/background.js	(revision 0)
@@ -0,0 +1,15 @@
+// Copyright (c) 2012 The Chromium Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+// Called when the user clicks on the browser action.
+chrome.browserAction.onClicked.addListener(function(windowId) {
+  chrome.tabs.executeScript(null, { code: "document.body.bgColor='green'" });
+});
+
+// Called when the user activates the command.
+chrome.experimental.keybinding.onCommand.addListener(function(command) {
+  chrome.tabs.executeScript(null, { code: "document.body.bgColor='yellow'" });
+});
+
+chrome.test.notifyPass();
Property changes on: chrome\test\data\extensions\api_test\keybinding\conflicting\background.js
___________________________________________________________________
Added: svn:eol-style
   + LF