Merge pull request #13424 from yxl/remove-keyboard-extension

Bug 932151 - Get rid of keyboard@gaiamobile.org extension. r=fabrice
mozilla-b2g · Nov 11, 2013 · a4e3fc2 · a4e3fc2
2 parents da7d5a4 + 7a423b9
commit a4e3fc2
Show file tree

Hide file tree

Showing 5 changed files with 1 addition and 1,202 deletions.
diff --git a/tools/extensions/browser-helper@gaiamobile.org/bootstrap.js b/tools/extensions/browser-helper@gaiamobile.org/bootstrap.js
@@ -180,18 +180,7 @@ function startup(data, reason) {
 
       // XXX This code should be loaded by the keyboard/ extension
       Cu.import('resource://gre/modules/Keyboard.jsm')
-      mm.addMessageListener('Forms:Input', Keyboard);
-      mm.addMessageListener('Forms:SelectionChange', Keyboard);
-      mm.addMessageListener('Forms:GetText:Result:OK', Keyboard);
-      mm.addMessageListener('Forms:GetText:Result:Error', Keyboard);
-      mm.addMessageListener('Forms:SetSelectionRange:Result:OK', Keyboard);
-      mm.addMessageListener('Forms:ReplaceSurroundingText:Result:OK', Keyboard);
-      mm.addMessageListener('Forms:SendKey:Result:OK', Keyboard);
-      mm.addMessageListener('Forms:SequenceError', Keyboard);
-      mm.addMessageListener('Forms:GetContext:Result:OK', Keyboard);
-      mm.addMessageListener('Forms:SetComposition:Result:OK', Keyboard);
-      mm.addMessageListener('Forms:EndComposition:Result:OK', Keyboard);
-      mm.loadFrameScript('chrome://keyboard.js/content/forms.js', true);
+      Keyboard.initFormsFrameScript(mm);
     }, 'sessionstore-windows-restored', false);
 
     try {

diff --git a/tools/extensions/keyboard/chrome.manifest b/tools/extensions/keyboard/chrome.manifest