Move input.ime back out of experimental for M21

BUG=chromium-os:23646


Review URL: https://chromiumcodereview.appspot.com/10533170

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@142664 0039d316-1c4b-4281-b951-d872f2087c98

2 files changed, 7 insertions, 9 deletions

diff --git a/chrome/renderer/extensions/extension_dispatcher.cc b/chrome/renderer/extensions/extension_dispatcher.cc
index add0813..221f202 100644
--- a/chrome/renderer/extensions/extension_dispatcher.cc
+++ b/chrome/renderer/extensions/extension_dispatcher.cc
@@ -582,8 +582,7 @@ void ExtensionDispatcher::PopulateSourceMap() {
   source_map_.RegisterSource("fileSystem",
                              IDR_FILE_SYSTEM_CUSTOM_BINDINGS_JS);
   source_map_.RegisterSource("i18n", IDR_I18N_CUSTOM_BINDINGS_JS);
-  source_map_.RegisterSource("experimental.input.ime",
-                             IDR_INPUT_IME_CUSTOM_BINDINGS_JS);
+  source_map_.RegisterSource("input.ime", IDR_INPUT_IME_CUSTOM_BINDINGS_JS);
   source_map_.RegisterSource("omnibox", IDR_OMNIBOX_CUSTOM_BINDINGS_JS);
   source_map_.RegisterSource("pageActions",
                              IDR_PAGE_ACTIONS_CUSTOM_BINDINGS_JS);
diff --git a/chrome/renderer/resources/extensions/input.ime_custom_bindings.js b/chrome/renderer/resources/extensions/input.ime_custom_bindings.js
index bf48ea7..8f400c7 100644
--- a/chrome/renderer/resources/extensions/input.ime_custom_bindings.js
+++ b/chrome/renderer/resources/extensions/input.ime_custom_bindings.js
@@ -7,30 +7,29 @@
 
 var chromeHidden = requireNative('chrome_hidden').GetChromeHidden();
 
-chromeHidden.registerCustomHook('experimental.input.ime', function() {
-  chrome.experimental.input.ime.onKeyEvent.dispatch =
-    function(engineID, keyData) {
+chromeHidden.registerCustomHook('input.ime', function() {
+  chrome.input.ime.onKeyEvent.dispatch = function(engineID, keyData) {
     var args = Array.prototype.slice.call(arguments);
     if (this.validate_) {
       var validationErrors = this.validate_(args);
       if (validationErrors) {
-        chrome.experimental.input.ime.eventHandled(requestId, false);
+        chrome.input.ime.eventHandled(requestId, false);
         return validationErrors;
       }
     }
     if (this.listeners_.length > 1) {
       console.error('Too many listeners for onKeyEvent: ' + e.stack);
-      chrome.experimental.input.ime.eventHandled(requestId, false);
+      chrome.input.ime.eventHandled(requestId, false);
       return;
     }
     for (var i = 0; i < this.listeners_.length; i++) {
       try {
         var requestId = keyData.requestId;
         var result = this.listeners_[i].apply(null, args);
-        chrome.experimental.input.ime.eventHandled(requestId, result);
+        chrome.input.ime.eventHandled(requestId, result);
       } catch (e) {
         console.error('Error in event handler for onKeyEvent: ' + e.stack);
-        chrome.experimental.input.ime.eventHandled(requestId, false);
+        chrome.input.ime.eventHandled(requestId, false);
       }
     }
   };