Rename permission from input to ime.

Add a proper permission message.
Update the API to be ChromeOS only

BUG=None
TEST=None

Review URL: http://codereview.chromium.org/8757015

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

8 files changed, 17 insertions, 2 deletions

diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources.grd
index 467e131..a631d95 100644
--- a/chrome/app/generated_resources.grd
+++ b/chrome/app/generated_resources.grd
@@ -4036,6 +4036,9 @@ Update checks have repeatedly failed for the extension "<ph name="EXTENSION_NAME
       <message name="IDS_EXTENSION_PROMPT_WARNING_CONTENT_SETTINGS" desc="Permission string for access to content settings.">
         Settings that specify whether websites can use features such as cookies, JavaScript, and plug-ins
       </message>
+      <message name="IDS_EXTENSION_PROMPT_WARNING_IME" desc="Permission string for access to ime.">
+        Anything you type.
+      </message>
 
       <!-- Extension/App error messages -->
       <message name="IDS_EXTENSION_CANT_GET_ABSOLUTE_PATH" desc="Warning displayed in pack dialog when the absolute path to the extension directory can not be found.">
diff --git a/chrome/browser/extensions/extension_input_ime_apitest.cc b/chrome/browser/extensions/extension_input_ime_apitest_chromeos.cc
index 1c4bd77..1c4bd77 100644
--- a/chrome/browser/extensions/extension_input_ime_apitest.cc
+++ b/chrome/browser/extensions/extension_input_ime_apitest_chromeos.cc
diff --git a/chrome/chrome_tests.gypi b/chrome/chrome_tests.gypi
index a98c1c1..070649b 100644
--- a/chrome/chrome_tests.gypi
+++ b/chrome/chrome_tests.gypi
@@ -2533,7 +2533,7 @@
         'browser/extensions/extension_incognito_apitest.cc',
         'browser/extensions/extension_info_private_apitest_chromeos.cc',
         'browser/extensions/extension_input_apitest.cc',
-        'browser/extensions/extension_input_ime_apitest.cc',
+        'browser/extensions/extension_input_ime_apitest_chromeos.cc',
         'browser/extensions/extension_input_method_apitest.cc',
         'browser/extensions/extension_input_ui_apitest.cc',
         'browser/extensions/extension_install_ui_browsertest.cc',
diff --git a/chrome/common/extensions/api/extension_api.json b/chrome/common/extensions/api/extension_api.json
index 30d2d0c..0c9cd4c 100644
--- a/chrome/common/extensions/api/extension_api.json
+++ b/chrome/common/extensions/api/extension_api.json
@@ -3103,6 +3103,7 @@
   },
   {
     "namespace": "experimental.input.ime",
+    "platforms": ["chromeos"],
     "nodoc": true,
     "types": [
       {
diff --git a/chrome/common/extensions/extension_permission_set.cc b/chrome/common/extensions/extension_permission_set.cc
index beae3d3..be993bc 100644
--- a/chrome/common/extensions/extension_permission_set.cc
+++ b/chrome/common/extensions/extension_permission_set.cc
@@ -249,6 +249,10 @@ void ExtensionAPIPermission::RegisterAllPermissions(
       kIdle, "idle", 0, ExtensionPermissionMessage::kNone,
       kFlagSupportsOptional, kTypeDefault);
   info->RegisterPermission(
+      kIme, "ime", IDS_EXTENSION_PROMPT_WARNING_IME,
+      ExtensionPermissionMessage::kIme,
+      kFlagSupportsOptional, kTypeDefault);
+  info->RegisterPermission(
       kInputMethodPrivate, "inputMethodPrivate", 0,
       ExtensionPermissionMessage::kNone, kFlagNone, kTypeDefault);
   info->RegisterPermission(
diff --git a/chrome/common/extensions/extension_permission_set.h b/chrome/common/extensions/extension_permission_set.h
index d151d73..5dec8be 100644
--- a/chrome/common/extensions/extension_permission_set.h
+++ b/chrome/common/extensions/extension_permission_set.h
@@ -48,6 +48,7 @@ class ExtensionPermissionMessage {
     kTtsEngine,
     kContentSettings,
     kAllPageContent,
+    kIme,
     kEnumBoundary
   };
 
@@ -110,6 +111,7 @@ class ExtensionAPIPermission {
     kGeolocation,
     kHistory,
     kIdle,
+    kIme,
     kInputMethodPrivate,
     kManagement,
     kMediaPlayerPrivate,
diff --git a/chrome/renderer/resources/extensions/schema_generated_bindings.js b/chrome/renderer/resources/extensions/schema_generated_bindings.js
index c50d33b..0b617cf 100644
--- a/chrome/renderer/resources/extensions/schema_generated_bindings.js
+++ b/chrome/renderer/resources/extensions/schema_generated_bindings.js
@@ -408,6 +408,11 @@ var chrome = chrome || {};
     customBindings['StorageNamespace'] = StorageNamespace;
   }
   function setupInputEvents() {
+    if (chrome.experimental.input == undefined ||
+        chrome.experimental.input.ime == undefined) {
+      // The IME api is not available, don't set up the event.
+      return;
+    }
     chrome.experimental.input.ime.onKeyEvent.dispatch =
         function(engineID, keyData) {
       var args = Array.prototype.slice.call(arguments);
diff --git a/chrome/test/data/extensions/api_test/input_ime/manifest.json b/chrome/test/data/extensions/api_test/input_ime/manifest.json
index cd54263..4acf505 100644
--- a/chrome/test/data/extensions/api_test/input_ime/manifest.json
+++ b/chrome/test/data/extensions/api_test/input_ime/manifest.json
@@ -5,7 +5,7 @@
   "manifest_version": 2,
   "description": "Input method ime tests.",
   "background_page": "background.html",
-  "permissions": [ "input", "experimental" ],
+  "permissions": [ "ime", "experimental" ],
   "input_components": [{
     "name": "Test IME",
     "type": "ime",