diff options
20 files changed, 76 insertions, 67 deletions
diff --git a/chrome/browser/extensions/extension_input_ime_api.cc b/chrome/browser/extensions/extension_input_ime_api.cc index 632d931..5d0eaca 100644 --- a/chrome/browser/extensions/extension_input_ime_api.cc +++ b/chrome/browser/extensions/extension_input_ime_api.cc @@ -128,16 +128,14 @@ bool ReadMenuItems( namespace events { -const char kOnActivate[] = "experimental.input.ime.onActivate"; -const char kOnDeactivated[] = "experimental.input.ime.onDeactivated"; -const char kOnFocus[] = "experimental.input.ime.onFocus"; -const char kOnBlur[] = "experimental.input.ime.onBlur"; -const char kOnInputContextUpdate[] = - "experimental.input.ime.onInputContextUpdate"; -const char kOnKeyEvent[] = "experimental.input.ime.onKeyEvent"; -const char kOnCandidateClicked[] = "experimental.input.ime.onCandidateClicked"; -const char kOnMenuItemActivated[] = - "experimental.input.ime.onMenuItemActivated"; +const char kOnActivate[] = "input.ime.onActivate"; +const char kOnDeactivated[] = "input.ime.onDeactivated"; +const char kOnFocus[] = "input.ime.onFocus"; +const char kOnBlur[] = "input.ime.onBlur"; +const char kOnInputContextUpdate[] = "input.ime.onInputContextUpdate"; +const char kOnKeyEvent[] = "input.ime.onKeyEvent"; +const char kOnCandidateClicked[] = "input.ime.onCandidateClicked"; +const char kOnMenuItemActivated[] = "input.ime.onMenuItemActivated"; } // namespace events diff --git a/chrome/browser/extensions/extension_input_ime_api.h b/chrome/browser/extensions/extension_input_ime_api.h index baf5956..a6d1308 100644 --- a/chrome/browser/extensions/extension_input_ime_api.h +++ b/chrome/browser/extensions/extension_input_ime_api.h @@ -1,4 +1,4 @@ -// Copyright (c) 2011 The Chromium Authors. All rights reserved. +// 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. @@ -68,36 +68,31 @@ class ExtensionInputImeEventRouter { class SetCompositionFunction : public SyncExtensionFunction { public: virtual bool RunImpl() OVERRIDE; - DECLARE_EXTENSION_FUNCTION_NAME( - "experimental.input.ime.setComposition"); + DECLARE_EXTENSION_FUNCTION_NAME("input.ime.setComposition"); }; class ClearCompositionFunction : public SyncExtensionFunction { public: virtual bool RunImpl() OVERRIDE; - DECLARE_EXTENSION_FUNCTION_NAME( - "experimental.input.ime.clearComposition"); + DECLARE_EXTENSION_FUNCTION_NAME("input.ime.clearComposition"); }; class CommitTextFunction : public SyncExtensionFunction { public: virtual bool RunImpl() OVERRIDE; - DECLARE_EXTENSION_FUNCTION_NAME( - "experimental.input.ime.commitText"); + DECLARE_EXTENSION_FUNCTION_NAME("input.ime.commitText"); }; class SetCandidateWindowPropertiesFunction : public SyncExtensionFunction { public: virtual bool RunImpl() OVERRIDE; - DECLARE_EXTENSION_FUNCTION_NAME( - "experimental.input.ime.setCandidateWindowProperties"); + DECLARE_EXTENSION_FUNCTION_NAME("input.ime.setCandidateWindowProperties"); }; class SetCandidatesFunction : public SyncExtensionFunction { public: virtual bool RunImpl() OVERRIDE; - DECLARE_EXTENSION_FUNCTION_NAME( - "experimental.input.ime.setCandidates"); + DECLARE_EXTENSION_FUNCTION_NAME("input.ime.setCandidates"); private: bool ReadCandidates( ListValue* candidates, @@ -107,28 +102,25 @@ class SetCandidatesFunction : public SyncExtensionFunction { class SetCursorPositionFunction : public SyncExtensionFunction { public: virtual bool RunImpl() OVERRIDE; - DECLARE_EXTENSION_FUNCTION_NAME( - "experimental.input.ime.setCursorPosition"); + DECLARE_EXTENSION_FUNCTION_NAME("input.ime.setCursorPosition"); }; class SetMenuItemsFunction : public SyncExtensionFunction { public: virtual bool RunImpl() OVERRIDE; - DECLARE_EXTENSION_FUNCTION_NAME( - "experimental.input.ime.setMenuItems"); + DECLARE_EXTENSION_FUNCTION_NAME("input.ime.setMenuItems"); }; class UpdateMenuItemsFunction : public SyncExtensionFunction { public: virtual bool RunImpl() OVERRIDE; - DECLARE_EXTENSION_FUNCTION_NAME( - "experimental.input.ime.updateMenuItems"); + DECLARE_EXTENSION_FUNCTION_NAME("input.ime.updateMenuItems"); }; class InputEventHandled : public AsyncExtensionFunction { public: virtual bool RunImpl() OVERRIDE; - DECLARE_EXTENSION_FUNCTION_NAME("experimental.input.ime.eventHandled"); + DECLARE_EXTENSION_FUNCTION_NAME("input.ime.eventHandled"); }; #endif // CHROME_BROWSER_EXTENSIONS_EXTENSION_INPUT_IME_API_H_ diff --git a/chrome/browser/extensions/extension_input_ime_apitest_chromeos.cc b/chrome/browser/extensions/extension_input_ime_apitest_chromeos.cc index 1c4bd77..cd0ced6 100644 --- a/chrome/browser/extensions/extension_input_ime_apitest_chromeos.cc +++ b/chrome/browser/extensions/extension_input_ime_apitest_chromeos.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2011 The Chromium Authors. All rights reserved. +// 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. @@ -9,9 +9,6 @@ #if defined(OS_CHROMEOS) IN_PROC_BROWSER_TEST_F(ExtensionApiTest, InputImeApiBasic) { - CommandLine::ForCurrentProcess()->AppendSwitch( - switches::kEnableExperimentalExtensionApis); - ASSERT_TRUE(RunExtensionTest("input_ime")) << message_; } #endif diff --git a/chrome/chrome_renderer.gypi b/chrome/chrome_renderer.gypi index 1d8ce4c..18c3fd1 100644 --- a/chrome/chrome_renderer.gypi +++ b/chrome/chrome_renderer.gypi @@ -128,12 +128,12 @@ 'renderer/resources/extensions/context_menus_custom_bindings.js', 'renderer/resources/extensions/devtools_custom_bindings.js', 'renderer/resources/extensions/event.js', - 'renderer/resources/extensions/experimental.input.ime_custom_bindings.js', 'renderer/resources/extensions/experimental.socket_custom_bindings.js', 'renderer/resources/extensions/extension_custom_bindings.js', 'renderer/resources/extensions/file_browser_handler_custom_bindings.js', 'renderer/resources/extensions/file_browser_private_custom_bindings.js', 'renderer/resources/extensions/greasemonkey_api.js', + 'renderer/resources/extensions/input.ime_custom_bindings.js', 'renderer/resources/extensions/json_schema.js', 'renderer/resources/extensions/miscellaneous_bindings.js', 'renderer/resources/extensions/omnibox_custom_bindings.js', diff --git a/chrome/common/common_resources.grd b/chrome/common/common_resources.grd index 2410265..8e5cc07 100644 --- a/chrome/common/common_resources.grd +++ b/chrome/common/common_resources.grd @@ -26,7 +26,6 @@ <include name="IDR_EXTENSION_API_JSON_EXPERIMENTAL_DNS" file="extensions\api\experimental.dns.json" type="BINDATA" /> <include name="IDR_EXTENSION_API_JSON_EXPERIMENTAL_DOWNLOADS" file="extensions\api\experimental.downloads.json" type="BINDATA" /> <include name="IDR_EXTENSION_API_JSON_EXPERIMENTAL_INFOBARS" file="extensions\api\experimental.infobars.json" type="BINDATA" /> - <include name="IDR_EXTENSION_API_JSON_EXPERIMENTAL_INPUT_IME" file="extensions\api\experimental.input.ime.json" type="BINDATA" /> <include name="IDR_EXTENSION_API_JSON_EXPERIMENTAL_INPUT_UI" file="extensions\api\experimental.input.ui.json" type="BINDATA" /> <include name="IDR_EXTENSION_API_JSON_EXPERIMENTAL_INPUT_VIRTUALKEYBOARD" file="extensions\api\experimental.input.virtualKeyboard.json" type="BINDATA" /> <include name="IDR_EXTENSION_API_JSON_EXPERIMENTAL_PROCESSES" file="extensions\api\experimental.processes.json" type="BINDATA" /> @@ -40,6 +39,7 @@ <include name="IDR_EXTENSION_API_JSON_FILEBROWSERPRIVATE" file="extensions\api\fileBrowserPrivate.json" type="BINDATA" /> <include name="IDR_EXTENSION_API_JSON_HISTORY" file="extensions\api\history.json" type="BINDATA" /> <include name="IDR_EXTENSION_API_JSON_I18N" file="extensions\api\i18n.json" type="BINDATA" /> + <include name="IDR_EXTENSION_API_JSON_INPUT_IME" file="extensions\api\input.ime.json" type="BINDATA" /> <include name="IDR_EXTENSION_API_JSON_IDLE" file="extensions\api\idle.json" type="BINDATA" /> <include name="IDR_EXTENSION_API_JSON_INPUTMETHODPRIVATE" file="extensions\api\inputMethodPrivate.json" type="BINDATA" /> <include name="IDR_EXTENSION_API_JSON_MANAGEMENT" file="extensions\api\management.json" type="BINDATA" /> diff --git a/chrome/common/extensions/api/extension_api.cc b/chrome/common/extensions/api/extension_api.cc index 1459e3a..a012c49 100644 --- a/chrome/common/extensions/api/extension_api.cc +++ b/chrome/common/extensions/api/extension_api.cc @@ -91,7 +91,6 @@ ExtensionAPI::ExtensionAPI() { IDR_EXTENSION_API_JSON_EXPERIMENTAL_DNS, IDR_EXTENSION_API_JSON_EXPERIMENTAL_DOWNLOADS, IDR_EXTENSION_API_JSON_EXPERIMENTAL_INFOBARS, - IDR_EXTENSION_API_JSON_EXPERIMENTAL_INPUT_IME, IDR_EXTENSION_API_JSON_EXPERIMENTAL_INPUT_UI, IDR_EXTENSION_API_JSON_EXPERIMENTAL_INPUT_VIRTUALKEYBOARD, IDR_EXTENSION_API_JSON_EXPERIMENTAL_PROCESSES, @@ -106,6 +105,7 @@ ExtensionAPI::ExtensionAPI() { IDR_EXTENSION_API_JSON_HISTORY, IDR_EXTENSION_API_JSON_I18N, IDR_EXTENSION_API_JSON_IDLE, + IDR_EXTENSION_API_JSON_INPUT_IME, IDR_EXTENSION_API_JSON_INPUTMETHODPRIVATE, IDR_EXTENSION_API_JSON_MANAGEMENT, IDR_EXTENSION_API_JSON_MEDIAPLAYERPRIVATE, diff --git a/chrome/common/extensions/api/experimental.input.ime.json b/chrome/common/extensions/api/input.ime.json index 9c4030e..8227c02 100644 --- a/chrome/common/extensions/api/experimental.input.ime.json +++ b/chrome/common/extensions/api/input.ime.json @@ -1,8 +1,7 @@ [ { - "namespace": "experimental.input.ime", + "namespace": "input.ime", "platforms": ["chromeos"], - "nodoc": true, "types": [ { "id": "KeyboardEvent", diff --git a/chrome/common/extensions/docs/api_index.html b/chrome/common/extensions/docs/api_index.html index 78dc513..f1b2f50 100644 --- a/chrome/common/extensions/docs/api_index.html +++ b/chrome/common/extensions/docs/api_index.html @@ -374,7 +374,7 @@ Here are the supported chrome.* APIs: </p> <ul> - <li><a href="bookmarks.html" js="">bookmarks</a></li><li><a href="browserAction.html" js="">browserAction</a></li><li><a href="contentSettings.html" js="">contentSettings</a></li><li><a href="contextMenus.html" js="">contextMenus</a></li><li><a href="cookies.html" js="">cookies</a></li><li><a href="debugger.html" js="">debugger</a></li><li><a href="extension.html" js="">extension</a></li><li><a href="fileBrowserHandler.html" js="">fileBrowserHandler</a></li><li><a href="history.html" js="">history</a></li><li><a href="i18n.html" js="">i18n</a></li><li><a href="idle.html" js="">idle</a></li><li><a href="management.html" js="">management</a></li><li><a href="omnibox.html" js="">omnibox</a></li><li><a href="pageAction.html" js="">pageAction</a></li><li><a href="pageCapture.html" js="">pageCapture</a></li><li><a href="permissions.html" js="">permissions</a></li><li><a href="privacy.html" js="">privacy</a></li><li><a href="proxy.html" js="">proxy</a></li><li><a href="storage.html" js="">storage</a></li><li><a href="tabs.html" js="">tabs</a></li><li><a href="tts.html" js="">tts</a></li><li><a href="ttsEngine.html" js="">ttsEngine</a></li><li><a href="types.html" js="">types</a></li><li><a href="webNavigation.html" js="">webNavigation</a></li><li><a href="webRequest.html" js="">webRequest</a></li><li><a href="windows.html" js="">windows</a></li> + <li><a href="bookmarks.html" js="">bookmarks</a></li><li><a href="browserAction.html" js="">browserAction</a></li><li><a href="contentSettings.html" js="">contentSettings</a></li><li><a href="contextMenus.html" js="">contextMenus</a></li><li><a href="cookies.html" js="">cookies</a></li><li><a href="debugger.html" js="">debugger</a></li><li><a href="extension.html" js="">extension</a></li><li><a href="fileBrowserHandler.html" js="">fileBrowserHandler</a></li><li><a href="history.html" js="">history</a></li><li><a href="i18n.html" js="">i18n</a></li><li><a href="idle.html" js="">idle</a></li><li><a href="input.ime.html" js="">input.ime</a></li><li><a href="management.html" js="">management</a></li><li><a href="omnibox.html" js="">omnibox</a></li><li><a href="pageAction.html" js="">pageAction</a></li><li><a href="pageCapture.html" js="">pageCapture</a></li><li><a href="permissions.html" js="">permissions</a></li><li><a href="privacy.html" js="">privacy</a></li><li><a href="proxy.html" js="">proxy</a></li><li><a href="storage.html" js="">storage</a></li><li><a href="tabs.html" js="">tabs</a></li><li><a href="tts.html" js="">tts</a></li><li><a href="ttsEngine.html" js="">ttsEngine</a></li><li><a href="types.html" js="">types</a></li><li><a href="webNavigation.html" js="">webNavigation</a></li><li><a href="webRequest.html" js="">webRequest</a></li><li><a href="windows.html" js="">windows</a></li> </ul> <h2 id="experimental">Experimental APIs</h2> diff --git a/chrome/common/extensions/docs/js/api_page_generator.js b/chrome/common/extensions/docs/js/api_page_generator.js index 568ec62..b838b22 100644 --- a/chrome/common/extensions/docs/js/api_page_generator.js +++ b/chrome/common/extensions/docs/js/api_page_generator.js @@ -37,7 +37,6 @@ var MODULE_SCHEMAS = [ '../api/experimental.dns.json', '../api/experimental.downloads.json', '../api/experimental.infobars.json', - '../api/experimental.input.ime.json', '../api/experimental.input.ui.json', '../api/experimental.input.virtualKeyboard.json', '../api/experimental.processes.json', @@ -52,6 +51,7 @@ var MODULE_SCHEMAS = [ '../api/history.json', '../api/i18n.json', '../api/idle.json', + '../api/input.ime.json', '../api/inputMethodPrivate.json', '../api/management.json', '../api/mediaPlayerPrivate.json', diff --git a/chrome/common/extensions/docs/samples.html b/chrome/common/extensions/docs/samples.html index 350296d..432a613 100644 --- a/chrome/common/extensions/docs/samples.html +++ b/chrome/common/extensions/docs/samples.html @@ -454,6 +454,8 @@ </span><span> <a href="javascript:void(0);" onclick="setFilter('chrome.idle', this)">chrome.idle</a><span>, </span> </span><span> + <a href="javascript:void(0);" onclick="setFilter('chrome.input.ime', this)">chrome.input.ime</a><span>, </span> + </span><span> <a href="javascript:void(0);" onclick="setFilter('chrome.management', this)">chrome.management</a><span>, </span> </span><span> <a href="javascript:void(0);" onclick="setFilter('chrome.omnibox', this)">chrome.omnibox</a><span>, </span> diff --git a/chrome/common/extensions/docs/samples.json b/chrome/common/extensions/docs/samples.json index 9af2653..72b1eee 100644 --- a/chrome/common/extensions/docs/samples.json +++ b/chrome/common/extensions/docs/samples.json @@ -106,6 +106,23 @@ "chrome.i18n.getMessage": "i18n.html#method-getMessage", "chrome.idle.onStateChanged": "idle.html#event-onStateChanged", "chrome.idle.queryState": "idle.html#method-queryState", + "chrome.input.ime.clearComposition": "input.ime.html#method-clearComposition", + "chrome.input.ime.commitText": "input.ime.html#method-commitText", + "chrome.input.ime.eventHandled": "input.ime.html#method-eventHandled", + "chrome.input.ime.onActivate": "input.ime.html#event-onActivate", + "chrome.input.ime.onBlur": "input.ime.html#event-onBlur", + "chrome.input.ime.onCandidateClicked": "input.ime.html#event-onCandidateClicked", + "chrome.input.ime.onDeactivated": "input.ime.html#event-onDeactivated", + "chrome.input.ime.onFocus": "input.ime.html#event-onFocus", + "chrome.input.ime.onInputContextUpdate": "input.ime.html#event-onInputContextUpdate", + "chrome.input.ime.onKeyEvent": "input.ime.html#event-onKeyEvent", + "chrome.input.ime.onMenuItemActivated": "input.ime.html#event-onMenuItemActivated", + "chrome.input.ime.setCandidateWindowProperties": "input.ime.html#method-setCandidateWindowProperties", + "chrome.input.ime.setCandidates": "input.ime.html#method-setCandidates", + "chrome.input.ime.setComposition": "input.ime.html#method-setComposition", + "chrome.input.ime.setCursorPosition": "input.ime.html#method-setCursorPosition", + "chrome.input.ime.setMenuItems": "input.ime.html#method-setMenuItems", + "chrome.input.ime.updateMenuItems": "input.ime.html#method-updateMenuItems", "chrome.management.get": "management.html#method-get", "chrome.management.getAll": "management.html#method-getAll", "chrome.management.getPermissionWarningsById": "management.html#method-getPermissionWarningsById", diff --git a/chrome/common/extensions/extension.cc b/chrome/common/extensions/extension.cc index 8dae526..92d0c5e 100644 --- a/chrome/common/extensions/extension.cc +++ b/chrome/common/extensions/extension.cc @@ -2106,8 +2106,7 @@ bool Extension::InitFromValue(extensions::Manifest* manifest, int flags, } } - if (api_permissions.count(ExtensionAPIPermission::kExperimental) && - manifest->HasKey(keys::kInputComponents)) { + if (manifest->HasKey(keys::kInputComponents)) { ListValue* list_value = NULL; if (!manifest->GetList(keys::kInputComponents, &list_value)) { *error = ASCIIToUTF16(errors::kInvalidInputComponents); @@ -2145,6 +2144,12 @@ bool Extension::InitFromValue(extensions::Manifest* manifest, int flags, if (type_str == "ime") { type = INPUT_COMPONENT_TYPE_IME; } else if (type_str == "virtual_keyboard") { + if (api_permissions.count(ExtensionAPIPermission::kExperimental)) { + // Virtual Keyboards require the experimental flag. + *error = ExtensionErrorUtils::FormatErrorMessageUTF16( + errors::kInvalidInputComponentType, base::IntToString(i)); + return false; + } type = INPUT_COMPONENT_TYPE_VIRTUAL_KEYBOARD; } else { *error = ExtensionErrorUtils::FormatErrorMessageUTF16( diff --git a/chrome/common/extensions/extension_permission_set.cc b/chrome/common/extensions/extension_permission_set.cc index 7d68b9a..921eed6 100644 --- a/chrome/common/extensions/extension_permission_set.cc +++ b/chrome/common/extensions/extension_permission_set.cc @@ -242,7 +242,7 @@ void ExtensionAPIPermission::RegisterAllPermissions( kIdle, "idle", 0, ExtensionPermissionMessage::kNone, kFlagNone, kTypeDefault); info->RegisterPermission( - kIme, "ime", 0, ExtensionPermissionMessage::kNone, + kInput, "input", 0, ExtensionPermissionMessage::kNone, kFlagImpliesFullURLAccess, kTypeDefault); info->RegisterPermission( kInputMethodPrivate, "inputMethodPrivate", 0, diff --git a/chrome/common/extensions/extension_permission_set.h b/chrome/common/extensions/extension_permission_set.h index f287bb7..59b71a5 100644 --- a/chrome/common/extensions/extension_permission_set.h +++ b/chrome/common/extensions/extension_permission_set.h @@ -111,7 +111,7 @@ class ExtensionAPIPermission { kGeolocation, kHistory, kIdle, - kIme, + kInput, kInputMethodPrivate, kManagement, kMediaPlayerPrivate, diff --git a/chrome/common/extensions/extension_permission_set_unittest.cc b/chrome/common/extensions/extension_permission_set_unittest.cc index 3b20fe5..4c6b028 100644 --- a/chrome/common/extensions/extension_permission_set_unittest.cc +++ b/chrome/common/extensions/extension_permission_set_unittest.cc @@ -654,7 +654,7 @@ TEST(ExtensionPermissionSetTest, PermissionMessages) { // The ime, proxy, and webRequest permissions are warned as part of host // permission checks. - skip.insert(ExtensionAPIPermission::kIme); + skip.insert(ExtensionAPIPermission::kInput); skip.insert(ExtensionAPIPermission::kProxy); skip.insert(ExtensionAPIPermission::kWebRequest); skip.insert(ExtensionAPIPermission::kWebRequestBlocking); diff --git a/chrome/renderer/extensions/custom_bindings_util.cc b/chrome/renderer/extensions/custom_bindings_util.cc index 8196def..08fb523 100644 --- a/chrome/renderer/extensions/custom_bindings_util.cc +++ b/chrome/renderer/extensions/custom_bindings_util.cc @@ -35,7 +35,7 @@ std::vector<v8::Extension*> GetAll(ExtensionDispatcher* extension_dispatcher) { "extensions/browser_action_custom_bindings.js", "extensions/content_settings_custom_bindings.js", "extensions/devtools_custom_bindings.js", - "extensions/experimental.input.ime_custom_bindings.js", + "extensions/input.ime_custom_bindings.js", "extensions/omnibox_custom_bindings.js", "extensions/page_action_custom_bindings.js", "extensions/storage_custom_bindings.js", @@ -50,7 +50,7 @@ std::vector<v8::Extension*> GetAll(ExtensionDispatcher* extension_dispatcher) { IDR_BROWSER_ACTION_CUSTOM_BINDINGS_JS, IDR_CONTENT_SETTINGS_CUSTOM_BINDINGS_JS, IDR_DEVTOOLS_CUSTOM_BINDINGS_JS, - IDR_EXPERIMENTAL_INPUT_IME_CUSTOM_BINDINGS_JS, + IDR_INPUT_IME_CUSTOM_BINDINGS_JS, IDR_OMNIBOX_CUSTOM_BINDINGS_JS, IDR_PAGE_ACTION_CUSTOM_BINDINGS_JS, IDR_STORAGE_CUSTOM_BINDINGS_JS, diff --git a/chrome/renderer/renderer_resources.grd b/chrome/renderer/renderer_resources.grd index 0d58a99..533ea8c 100644 --- a/chrome/renderer/renderer_resources.grd +++ b/chrome/renderer/renderer_resources.grd @@ -33,11 +33,11 @@ without changes to the corresponding grd file. fb9 --> <include name="IDR_CONTENT_SETTINGS_CUSTOM_BINDINGS_JS" file="resources\extensions\content_settings_custom_bindings.js" type="BINDATA" /> <include name="IDR_CONTEXT_MENUS_CUSTOM_BINDINGS_JS" file="resources\extensions\context_menus_custom_bindings.js" type="BINDATA" /> <include name="IDR_DEVTOOLS_CUSTOM_BINDINGS_JS" file="resources\extensions\devtools_custom_bindings.js" type="BINDATA" /> - <include name="IDR_EXPERIMENTAL_INPUT_IME_CUSTOM_BINDINGS_JS" file="resources\extensions\experimental.input.ime_custom_bindings.js" type="BINDATA" /> <include name="IDR_EXPERIMENTAL_SOCKET_CUSTOM_BINDINGS_JS" file="resources\extensions\experimental.socket_custom_bindings.js" type="BINDATA" /> <include name="IDR_EXTENSION_CUSTOM_BINDINGS_JS" file="resources\extensions\extension_custom_bindings.js" type="BINDATA" /> <include name="IDR_FILE_BROWSER_HANDLER_CUSTOM_BINDINGS_JS" file="resources\extensions\file_browser_handler_custom_bindings.js" type="BINDATA" /> <include name="IDR_FILE_BROWSER_PRIVATE_CUSTOM_BINDINGS_JS" file="resources\extensions\file_browser_private_custom_bindings.js" type="BINDATA" /> + <include name="IDR_INPUT_IME_CUSTOM_BINDINGS_JS" file="resources\extensions\input.ime_custom_bindings.js" type="BINDATA" /> <include name="IDR_OMNIBOX_CUSTOM_BINDINGS_JS" file="resources\extensions\omnibox_custom_bindings.js" type="BINDATA" /> <include name="IDR_PAGE_ACTIONS_CUSTOM_BINDINGS_JS" file="resources\extensions\page_actions_custom_bindings.js" type="BINDATA" /> <include name="IDR_PAGE_ACTION_CUSTOM_BINDINGS_JS" file="resources\extensions\page_action_custom_bindings.js" type="BINDATA" /> diff --git a/chrome/renderer/resources/extensions/experimental.input.ime_custom_bindings.js b/chrome/renderer/resources/extensions/input.ime_custom_bindings.js index 99cafb6..7e87fbb 100644 --- a/chrome/renderer/resources/extensions/experimental.input.ime_custom_bindings.js +++ b/chrome/renderer/resources/extensions/input.ime_custom_bindings.js @@ -2,37 +2,36 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -// Custom bindings for the experimental input ime API. Only injected into the -// v8 contexts for extensions which have permission for the experimental API. +// Custom bindings for the input ime API. Only injected into the +// v8 contexts for extensions which have permission for the API. (function() { native function GetChromeHidden(); -GetChromeHidden().registerCustomHook('experimental.input.ime', function() { - chrome.experimental.input.ime.onKeyEvent.dispatch = - function(engineID, keyData) { +GetChromeHidden().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); } } }; diff --git a/chrome/test/data/extensions/api_test/input_ime/background.js b/chrome/test/data/extensions/api_test/input_ime/background.js index 96421ba..826d290 100644 --- a/chrome/test/data/extensions/api_test/input_ime/background.js +++ b/chrome/test/data/extensions/api_test/input_ime/background.js @@ -1,9 +1,9 @@ -// Copyright (c) 2011 The Chromium Authors. All rights reserved. +// 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. function setCompositionTest() { - chrome.experimental.input.ime.setComposition({ + chrome.input.ime.setComposition({ "contextID": 1, "text": "Pie", "selectionStart": 1, @@ -19,14 +19,14 @@ function setCompositionTest() { function clearCompositionTest() { - chrome.experimental.input.ime.clearComposition({ + chrome.input.ime.clearComposition({ "contextID": 1 }, chrome.test.callbackPass()); } function commitTextTest() { - chrome.experimental.input.ime.commitText({ + chrome.input.ime.commitText({ "contextID": 2, "text": "Seaguls" }, chrome.test.callbackPass()); @@ -34,7 +34,7 @@ function commitTextTest() { function setCandidateWindowPropertiesTest() { - chrome.experimental.input.ime.setCandidateWindowProperties({ + chrome.input.ime.setCandidateWindowProperties({ "engineID": "test", "properties": { "visible": true, @@ -49,7 +49,7 @@ function setCandidateWindowPropertiesTest() { function setCandidatesTest() { - chrome.experimental.input.ime.setCandidates({ + chrome.input.ime.setCandidates({ "contextID": 8, "candidates": [{ "candidate": "one", @@ -72,7 +72,7 @@ function setCandidatesTest() { function setCursorPositionTest() { - chrome.experimental.input.ime.setCursorPosition({ + chrome.input.ime.setCursorPosition({ "contextID": 9, "candidateID": 1 }, chrome.test.callbackPass()); @@ -81,7 +81,7 @@ function setCursorPositionTest() { function setMenuItemsTest() { - chrome.experimental.input.ime.setMenuItems({ + chrome.input.ime.setMenuItems({ "engineID": "test", "items": [{ "id": "Menu 1", @@ -100,7 +100,7 @@ function setMenuItemsTest() { } function updateMenuItemsTest() { - chrome.experimental.input.ime.updateMenuItems({ + chrome.input.ime.updateMenuItems({ "engineID": "test", "items": [{ "id": "Menu 1", 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 7f02aad..1382a2b 100644 --- a/chrome/test/data/extensions/api_test/input_ime/manifest.json +++ b/chrome/test/data/extensions/api_test/input_ime/manifest.json @@ -1,13 +1,13 @@ { "key": "MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQC9fDu8apG3Dz72XTT3Ym1SfGt06tdowTlYQ+3lGlCbVpfnMOmewgRgYxzUtUPso9aQERZcmI2+7UtbWjtk6/usl9Hr7a1JBQwfaUoUygEe56ajUeZhe/ErkH5CXT84U0pokfPr5vMvc7RVPduU+UBiF0DnGb/hSpzz/1UhJ5H9AwIDAQAB", - "name": "experimental.input.ime test", + "name": "input.ime test", "version": "0.1", "manifest_version": 2, "description": "Input method ime tests.", "background": { "scripts": ["background.js"] }, - "permissions": [ "ime", "experimental" ], + "permissions": [ "input" ], "input_components": [{ "name": "Test IME", "type": "ime", |