diff options
Diffstat (limited to 'chrome/browser')
3 files changed, 19 insertions, 32 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 |