chrome/browser/extensions/api/input_ime/input_ime_api.cc - Issue 750353004: Revert of Moves code from chromeos/ime to ui/base/ime/chromeos.

Side by Side Diff: chrome/browser/extensions/api/input_ime/input_ime_api.cc

Issue 750353004: Revert of Moves code from chromeos/ime to ui/base/ime/chromeos. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Created 6 years ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View unified diff | Download patch

« no previous file with comments | « chrome/browser/chromeos/preferences_browsertest.cc ('k') | chrome/browser/ui/ash/chrome_shell_delegate_chromeos.cc » ('j') | no next file with comments »

OLD	NEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.	1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.

2 // Use of this source code is governed by a BSD-style license that can be	2 // Use of this source code is governed by a BSD-style license that can be

3 // found in the LICENSE file.	3 // found in the LICENSE file.

4	4

5 #include "chrome/browser/extensions/api/input_ime/input_ime_api.h"	5 #include "chrome/browser/extensions/api/input_ime/input_ime_api.h"

6	6

7 #include "base/strings/string_number_conversions.h"	7 #include "base/strings/string_number_conversions.h"

8 #include "base/values.h"	8 #include "base/values.h"

9 #include "chrome/browser/chromeos/input_method/input_method_engine.h"	9 #include "chrome/browser/chromeos/input_method/input_method_engine.h"

10 #include "chrome/browser/chromeos/login/lock/screen_locker.h"	10 #include "chrome/browser/chromeos/login/lock/screen_locker.h"

11 #include "chrome/browser/chromeos/login/session/user_session_manager.h"	11 #include "chrome/browser/chromeos/login/session/user_session_manager.h"

12 #include "chrome/browser/chromeos/login/ui/user_adding_screen.h"	12 #include "chrome/browser/chromeos/login/ui/user_adding_screen.h"

13 #include "chrome/browser/chromeos/profiles/profile_helper.h"	13 #include "chrome/browser/chromeos/profiles/profile_helper.h"

14 #include "chrome/browser/extensions/extension_service.h"	14 #include "chrome/browser/extensions/extension_service.h"

15 #include "chrome/browser/profiles/profile_manager.h"	15 #include "chrome/browser/profiles/profile_manager.h"

16 #include "chrome/common/extensions/api/input_ime.h"	16 #include "chrome/common/extensions/api/input_ime.h"

17 #include "chrome/common/extensions/api/input_ime/input_components_handler.h"	17 #include "chrome/common/extensions/api/input_ime/input_components_handler.h"

	18 #include "chromeos/ime/component_extension_ime_manager.h"

	19 #include "chromeos/ime/extension_ime_util.h"

	20 #include "chromeos/ime/input_method_manager.h"

18 #include "extensions/browser/event_router.h"	21 #include "extensions/browser/event_router.h"

19 #include "extensions/browser/extension_function_registry.h"	22 #include "extensions/browser/extension_function_registry.h"

20 #include "extensions/browser/extension_registry.h"	23 #include "extensions/browser/extension_registry.h"

21 #include "extensions/browser/extension_system.h"	24 #include "extensions/browser/extension_system.h"

22 #include "extensions/common/manifest_handlers/background_info.h"	25 #include "extensions/common/manifest_handlers/background_info.h"

23 #include "ui/base/ime/chromeos/component_extension_ime_manager.h"

24 #include "ui/base/ime/chromeos/extension_ime_util.h"

25 #include "ui/base/ime/chromeos/input_method_manager.h"

26	26

27 namespace input_ime = extensions::api::input_ime;	27 namespace input_ime = extensions::api::input_ime;

28 namespace KeyEventHandled = extensions::api::input_ime::KeyEventHandled;	28 namespace KeyEventHandled = extensions::api::input_ime::KeyEventHandled;

29 namespace DeleteSurroundingText =	29 namespace DeleteSurroundingText =

30 extensions::api::input_ime::DeleteSurroundingText;	30 extensions::api::input_ime::DeleteSurroundingText;

31 namespace UpdateMenuItems = extensions::api::input_ime::UpdateMenuItems;	31 namespace UpdateMenuItems = extensions::api::input_ime::UpdateMenuItems;

32 namespace SendKeyEvents = extensions::api::input_ime::SendKeyEvents;	32 namespace SendKeyEvents = extensions::api::input_ime::SendKeyEvents;

33 namespace HideInputView = extensions::api::input_ime::HideInputView;	33 namespace HideInputView = extensions::api::input_ime::HideInputView;

34 namespace SetMenuItems = extensions::api::input_ime::SetMenuItems;	34 namespace SetMenuItems = extensions::api::input_ime::SetMenuItems;

35 namespace SetCursorPosition = extensions::api::input_ime::SetCursorPosition;	35 namespace SetCursorPosition = extensions::api::input_ime::SetCursorPosition;

(...skipping 855 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
891 // Notifies the IME extension for IME ready with onActivate/onFocus events.	891 // Notifies the IME extension for IME ready with onActivate/onFocus events.

892 if (engine)	892 if (engine)

893 engine->Enable(engine->GetActiveComponentId());	893 engine->Enable(engine->GetActiveComponentId());

894 }	894 }

895	895

896 InputImeEventRouter* InputImeAPI::input_ime_event_router() {	896 InputImeEventRouter* InputImeAPI::input_ime_event_router() {

897 return InputImeEventRouter::GetInstance();	897 return InputImeEventRouter::GetInstance();

898 }	898 }

899	899

900 } // namespace extensions	900 } // namespace extensions

OLD	NEW