diff options
| author | shuchen <shuchen@chromium.org> | 2014-11-27 09:24:40 -0800 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2014-11-27 17:24:58 +0000 |
| commit | 179b1f4f701238db40a8fbdb90d66c6a7ba1c2aa (patch) | |
| tree | 2cddec8123f47ceab1e7f6f4aff8eb7f5ddad77a /chrome/browser/chromeos/input_method | |
| parent | e6828dda7fbcc1c55cdb85639a3e4aa0d78e9647 (diff) | |
| download | chromium_src-179b1f4f701238db40a8fbdb90d66c6a7ba1c2aa.zip chromium_src-179b1f4f701238db40a8fbdb90d66c6a7ba1c2aa.tar.gz chromium_src-179b1f4f701238db40a8fbdb90d66c6a7ba1c2aa.tar.bz2 | |
Revert "Revert of Moves code from chromeos/ime to ui/base/ime/chromeos. (patchset #18 id:340001 of https://codereview.chromium.org/727143002/)"
This reverts commit 857735b6255938981bf2dec4aee80e7bc6523631.
This is the 2nd attempt of cl https://codereview.chromium.org/727143002,
which broke build of Linux ChromiumOS GN.
This cl removes the entries of mock_component_extension_ime_manager_delegate.{cc|h}
in chromeos/ime/BUILD.gn file which should fix the problem.
TBR=stevenjb@chromium.org,pkasting@chromium.org,sky@chromium.org,mukai@chromium.org,derat@chromium.org
BUG=431863
TEST=Verified on linux_chromeos.
Review URL: https://codereview.chromium.org/765833002
Cr-Commit-Position: refs/heads/master@{#306002}
Diffstat (limited to 'chrome/browser/chromeos/input_method')
21 files changed, 53 insertions, 50 deletions
diff --git a/chrome/browser/chromeos/input_method/accessibility.h b/chrome/browser/chromeos/input_method/accessibility.h index 8206d33..0ad3692 100644 --- a/chrome/browser/chromeos/input_method/accessibility.h +++ b/chrome/browser/chromeos/input_method/accessibility.h @@ -5,7 +5,7 @@ #ifndef CHROME_BROWSER_CHROMEOS_INPUT_METHOD_ACCESSIBILITY_H_ #define CHROME_BROWSER_CHROMEOS_INPUT_METHOD_ACCESSIBILITY_H_ -#include "chromeos/ime/input_method_manager.h" +#include "ui/base/ime/chromeos/input_method_manager.h" namespace chromeos { namespace input_method { diff --git a/chrome/browser/chromeos/input_method/browser_state_monitor.cc b/chrome/browser/chromeos/input_method/browser_state_monitor.cc index b7ad2ae..a0dbdae 100644 --- a/chrome/browser/chromeos/input_method/browser_state_monitor.cc +++ b/chrome/browser/chromeos/input_method/browser_state_monitor.cc @@ -7,8 +7,8 @@ #include "base/logging.h" #include "chrome/browser/chrome_notification_types.h" #include "chrome/browser/chromeos/input_method/input_method_util.h" -#include "chromeos/ime/input_method_delegate.h" #include "content/public/browser/notification_service.h" +#include "ui/base/ime/chromeos/input_method_delegate.h" namespace chromeos { namespace input_method { diff --git a/chrome/browser/chromeos/input_method/browser_state_monitor.h b/chrome/browser/chromeos/input_method/browser_state_monitor.h index 9907e4c..5929274 100644 --- a/chrome/browser/chromeos/input_method/browser_state_monitor.h +++ b/chrome/browser/chromeos/input_method/browser_state_monitor.h @@ -10,9 +10,9 @@ #include "base/basictypes.h" #include "base/callback.h" #include "base/compiler_specific.h" -#include "chromeos/ime/input_method_manager.h" #include "content/public/browser/notification_observer.h" #include "content/public/browser/notification_registrar.h" +#include "ui/base/ime/chromeos/input_method_manager.h" namespace chromeos { namespace input_method { diff --git a/chrome/browser/chromeos/input_method/component_extension_ime_manager_impl.cc b/chrome/browser/chromeos/input_method/component_extension_ime_manager_impl.cc index e2b9e5f..38b0182 100644 --- a/chrome/browser/chromeos/input_method/component_extension_ime_manager_impl.cc +++ b/chrome/browser/chromeos/input_method/component_extension_ime_manager_impl.cc @@ -20,12 +20,12 @@ #include "chrome/common/extensions/extension_constants.h" #include "chrome/grit/browser_resources.h" #include "chrome/grit/generated_resources.h" -#include "chromeos/ime/extension_ime_util.h" #include "content/public/browser/browser_thread.h" #include "extensions/browser/extension_system.h" #include "extensions/common/extension.h" #include "extensions/common/extension_l10n_util.h" #include "extensions/common/manifest_constants.h" +#include "ui/base/ime/chromeos/extension_ime_util.h" #include "ui/base/l10n/l10n_util.h" #include "ui/base/resource/resource_bundle.h" diff --git a/chrome/browser/chromeos/input_method/component_extension_ime_manager_impl.h b/chrome/browser/chromeos/input_method/component_extension_ime_manager_impl.h index 453c9ef..88edec2 100644 --- a/chrome/browser/chromeos/input_method/component_extension_ime_manager_impl.h +++ b/chrome/browser/chromeos/input_method/component_extension_ime_manager_impl.h @@ -13,7 +13,7 @@ #include "base/sequenced_task_runner.h" #include "base/threading/thread_checker.h" #include "base/values.h" -#include "chromeos/ime/component_extension_ime_manager.h" +#include "ui/base/ime/chromeos/component_extension_ime_manager.h" class Profile; diff --git a/chrome/browser/chromeos/input_method/input_method_delegate_impl.h b/chrome/browser/chromeos/input_method/input_method_delegate_impl.h index c08d7c3..146630c 100644 --- a/chrome/browser/chromeos/input_method/input_method_delegate_impl.h +++ b/chrome/browser/chromeos/input_method/input_method_delegate_impl.h @@ -9,7 +9,7 @@ #include "base/basictypes.h" #include "base/compiler_specific.h" -#include "chromeos/ime/input_method_delegate.h" +#include "ui/base/ime/chromeos/input_method_delegate.h" namespace chromeos { namespace input_method { diff --git a/chrome/browser/chromeos/input_method/input_method_engine.cc b/chrome/browser/chromeos/input_method/input_method_engine.cc index 1bc6996..6689b74 100644 --- a/chrome/browser/chromeos/input_method/input_method_engine.cc +++ b/chrome/browser/chromeos/input_method/input_method_engine.cc @@ -16,14 +16,14 @@ #include "base/strings/string_util.h" #include "base/strings/stringprintf.h" #include "base/strings/utf_string_conversions.h" -#include "chromeos/ime/component_extension_ime_manager.h" -#include "chromeos/ime/composition_text.h" -#include "chromeos/ime/extension_ime_util.h" -#include "chromeos/ime/input_method_manager.h" #include "ui/aura/window.h" #include "ui/aura/window_tree_host.h" #include "ui/base/ime/candidate_window.h" +#include "ui/base/ime/chromeos/component_extension_ime_manager.h" +#include "ui/base/ime/chromeos/composition_text.h" +#include "ui/base/ime/chromeos/extension_ime_util.h" #include "ui/base/ime/chromeos/ime_keymap.h" +#include "ui/base/ime/chromeos/input_method_manager.h" #include "ui/base/ime/text_input_flags.h" #include "ui/chromeos/ime/input_method_menu_item.h" #include "ui/chromeos/ime/input_method_menu_manager.h" diff --git a/chrome/browser/chromeos/input_method/input_method_engine.h b/chrome/browser/chromeos/input_method/input_method_engine.h index ac8fe0f..bcf85c4 100644 --- a/chrome/browser/chromeos/input_method/input_method_engine.h +++ b/chrome/browser/chromeos/input_method/input_method_engine.h @@ -10,7 +10,7 @@ #include <vector> #include "base/time/time.h" #include "chrome/browser/chromeos/input_method/input_method_engine_interface.h" -#include "chromeos/ime/input_method_descriptor.h" +#include "ui/base/ime/chromeos/input_method_descriptor.h" #include "url/gurl.h" class Profile; diff --git a/chrome/browser/chromeos/input_method/input_method_engine_browsertests.cc b/chrome/browser/chromeos/input_method/input_method_engine_browsertests.cc index d3f4367..6c039d0 100644 --- a/chrome/browser/chromeos/input_method/input_method_engine_browsertests.cc +++ b/chrome/browser/chromeos/input_method/input_method_engine_browsertests.cc @@ -6,16 +6,16 @@ #include "base/strings/stringprintf.h" #include "base/strings/utf_string_conversions.h" #include "chrome/browser/extensions/extension_browsertest.h" -#include "chromeos/ime/component_extension_ime_manager.h" -#include "chromeos/ime/composition_text.h" -#include "chromeos/ime/input_method_descriptor.h" -#include "chromeos/ime/input_method_manager.h" #include "content/public/test/browser_test_utils.h" #include "content/public/test/test_utils.h" #include "extensions/browser/process_manager.h" #include "extensions/common/manifest_handlers/background_info.h" #include "extensions/test/extension_test_message_listener.h" +#include "ui/base/ime/chromeos/component_extension_ime_manager.h" +#include "ui/base/ime/chromeos/composition_text.h" #include "ui/base/ime/chromeos/ime_bridge.h" +#include "ui/base/ime/chromeos/input_method_descriptor.h" +#include "ui/base/ime/chromeos/input_method_manager.h" #include "ui/base/ime/chromeos/mock_ime_candidate_window_handler.h" #include "ui/base/ime/chromeos/mock_ime_input_context_handler.h" #include "ui/base/ime/text_input_flags.h" diff --git a/chrome/browser/chromeos/input_method/input_method_engine_unittest.cc b/chrome/browser/chromeos/input_method/input_method_engine_unittest.cc index 7ea47be..660d712 100644 --- a/chrome/browser/chromeos/input_method/input_method_engine_unittest.cc +++ b/chrome/browser/chromeos/input_method/input_method_engine_unittest.cc @@ -11,9 +11,9 @@ #include "chrome/browser/chromeos/input_method/input_method_engine.h" #include "chrome/browser/chromeos/input_method/input_method_engine_interface.h" #include "chrome/browser/chromeos/input_method/mock_input_method_manager.h" -#include "chromeos/ime/extension_ime_util.h" -#include "chromeos/ime/mock_component_extension_ime_manager_delegate.h" #include "testing/gtest/include/gtest/gtest.h" +#include "ui/base/ime/chromeos/extension_ime_util.h" +#include "ui/base/ime/chromeos/mock_component_extension_ime_manager_delegate.h" #include "ui/base/ime/chromeos/mock_ime_input_context_handler.h" #include "ui/base/ime/text_input_flags.h" #include "ui/gfx/geometry/rect.h" diff --git a/chrome/browser/chromeos/input_method/input_method_manager_impl.cc b/chrome/browser/chromeos/input_method/input_method_manager_impl.cc index e8a37d0..f9fd914 100644 --- a/chrome/browser/chromeos/input_method/input_method_manager_impl.cc +++ b/chrome/browser/chromeos/input_method/input_method_manager_impl.cc @@ -28,14 +28,14 @@ #include "chrome/browser/chromeos/profiles/profile_helper.h" #include "chrome/browser/profiles/profile_manager.h" #include "chrome/common/pref_names.h" -#include "chromeos/ime/component_extension_ime_manager.h" -#include "chromeos/ime/extension_ime_util.h" -#include "chromeos/ime/fake_ime_keyboard.h" -#include "chromeos/ime/ime_keyboard.h" -#include "chromeos/ime/input_method_delegate.h" #include "components/user_manager/user_manager.h" #include "third_party/icu/source/common/unicode/uloc.h" #include "ui/base/accelerators/accelerator.h" +#include "ui/base/ime/chromeos/component_extension_ime_manager.h" +#include "ui/base/ime/chromeos/extension_ime_util.h" +#include "ui/base/ime/chromeos/fake_ime_keyboard.h" +#include "ui/base/ime/chromeos/ime_keyboard.h" +#include "ui/base/ime/chromeos/input_method_delegate.h" #include "ui/chromeos/ime/input_method_menu_item.h" #include "ui/chromeos/ime/input_method_menu_manager.h" #include "ui/keyboard/keyboard_controller.h" diff --git a/chrome/browser/chromeos/input_method/input_method_manager_impl.h b/chrome/browser/chromeos/input_method/input_method_manager_impl.h index 6ccc24f..50c605f 100644 --- a/chrome/browser/chromeos/input_method/input_method_manager_impl.h +++ b/chrome/browser/chromeos/input_method/input_method_manager_impl.h @@ -15,8 +15,8 @@ #include "chrome/browser/chromeos/input_method/candidate_window_controller.h" #include "chrome/browser/chromeos/input_method/input_method_util.h" #include "chrome/browser/profiles/profile.h" -#include "chromeos/ime/input_method_manager.h" -#include "chromeos/ime/input_method_whitelist.h" +#include "ui/base/ime/chromeos/input_method_manager.h" +#include "ui/base/ime/chromeos/input_method_whitelist.h" namespace chromeos { class ComponentExtensionIMEManager; diff --git a/chrome/browser/chromeos/input_method/input_method_manager_impl_unittest.cc b/chrome/browser/chromeos/input_method/input_method_manager_impl_unittest.cc index f11dd92..e77412d 100644 --- a/chrome/browser/chromeos/input_method/input_method_manager_impl_unittest.cc +++ b/chrome/browser/chromeos/input_method/input_method_manager_impl_unittest.cc @@ -21,12 +21,12 @@ #include "chrome/test/base/testing_browser_process.h" #include "chrome/test/base/testing_profile.h" #include "chrome/test/base/testing_profile_manager.h" -#include "chromeos/ime/extension_ime_util.h" -#include "chromeos/ime/fake_ime_keyboard.h" -#include "chromeos/ime/fake_input_method_delegate.h" -#include "chromeos/ime/mock_component_extension_ime_manager_delegate.h" #include "testing/gtest/include/gtest/gtest.h" #include "ui/base/accelerators/accelerator.h" +#include "ui/base/ime/chromeos/extension_ime_util.h" +#include "ui/base/ime/chromeos/fake_ime_keyboard.h" +#include "ui/base/ime/chromeos/fake_input_method_delegate.h" +#include "ui/base/ime/chromeos/mock_component_extension_ime_manager_delegate.h" #include "ui/base/ime/chromeos/mock_ime_engine_handler.h" #include "ui/base/ime/input_method_initializer.h" #include "ui/chromeos/ime/input_method_menu_item.h" diff --git a/chrome/browser/chromeos/input_method/input_method_persistence.h b/chrome/browser/chromeos/input_method/input_method_persistence.h index c477c03..1de944b 100644 --- a/chrome/browser/chromeos/input_method/input_method_persistence.h +++ b/chrome/browser/chromeos/input_method/input_method_persistence.h @@ -9,7 +9,7 @@ #include "base/basictypes.h" #include "base/compiler_specific.h" -#include "chromeos/ime/input_method_manager.h" +#include "ui/base/ime/chromeos/input_method_manager.h" class PrefService; diff --git a/chrome/browser/chromeos/input_method/input_method_util.cc b/chrome/browser/chromeos/input_method/input_method_util.cc index a0db58b..c08196b 100644 --- a/chrome/browser/chromeos/input_method/input_method_util.cc +++ b/chrome/browser/chromeos/input_method/input_method_util.cc @@ -16,14 +16,17 @@ #include "base/strings/string_util.h" #include "base/strings/utf_string_conversions.h" #include "chrome/common/extensions/extension_constants.h" + // TODO(nona): move this header from this file. #include "chrome/grit/generated_resources.h" -#include "chromeos/ime/component_extension_ime_manager.h" -#include "chromeos/ime/extension_ime_util.h" + +#include "ui/base/ime/chromeos/component_extension_ime_manager.h" +#include "ui/base/ime/chromeos/extension_ime_util.h" + // For SetHardwareKeyboardLayoutForTesting. -#include "chromeos/ime/fake_input_method_delegate.h" -#include "chromeos/ime/input_method_delegate.h" -#include "chromeos/ime/input_method_whitelist.h" +#include "ui/base/ime/chromeos/fake_input_method_delegate.h" +#include "ui/base/ime/chromeos/input_method_delegate.h" +#include "ui/base/ime/chromeos/input_method_whitelist.h" namespace { diff --git a/chrome/browser/chromeos/input_method/input_method_util.h b/chrome/browser/chromeos/input_method/input_method_util.h index 8b3b7d7..4d942d6 100644 --- a/chrome/browser/chromeos/input_method/input_method_util.h +++ b/chrome/browser/chromeos/input_method/input_method_util.h @@ -14,7 +14,7 @@ #include "base/memory/scoped_ptr.h" #include "base/strings/string16.h" #include "base/threading/thread_checker.h" -#include "chromeos/ime/input_method_descriptor.h" +#include "ui/base/ime/chromeos/input_method_descriptor.h" namespace chromeos { namespace input_method { diff --git a/chrome/browser/chromeos/input_method/input_method_util_unittest.cc b/chrome/browser/chromeos/input_method/input_method_util_unittest.cc index 9f001b7..9373a97 100644 --- a/chrome/browser/chromeos/input_method/input_method_util_unittest.cc +++ b/chrome/browser/chromeos/input_method/input_method_util_unittest.cc @@ -9,11 +9,11 @@ #include "base/bind.h" #include "base/memory/scoped_ptr.h" #include "base/strings/utf_string_conversions.h" -#include "chromeos/ime/extension_ime_util.h" -#include "chromeos/ime/fake_input_method_delegate.h" -#include "chromeos/ime/input_method_manager.h" -#include "chromeos/ime/input_method_whitelist.h" #include "testing/gtest/include/gtest/gtest.h" +#include "ui/base/ime/chromeos/extension_ime_util.h" +#include "ui/base/ime/chromeos/fake_input_method_delegate.h" +#include "ui/base/ime/chromeos/input_method_manager.h" +#include "ui/base/ime/chromeos/input_method_whitelist.h" #include "ui/base/l10n/l10n_util.h" using base::ASCIIToUTF16; diff --git a/chrome/browser/chromeos/input_method/mock_input_method_engine.h b/chrome/browser/chromeos/input_method/mock_input_method_engine.h index c19a7a0..32e0df8 100644 --- a/chrome/browser/chromeos/input_method/mock_input_method_engine.h +++ b/chrome/browser/chromeos/input_method/mock_input_method_engine.h @@ -9,7 +9,7 @@ #include <vector> #include "chrome/browser/chromeos/input_method/input_method_engine_interface.h" -#include "chromeos/ime/input_method_descriptor.h" +#include "ui/base/ime/chromeos/input_method_descriptor.h" namespace ui { class KeyEvent; diff --git a/chrome/browser/chromeos/input_method/mock_input_method_manager.h b/chrome/browser/chromeos/input_method/mock_input_method_manager.h index 76b7c22..366694c 100644 --- a/chrome/browser/chromeos/input_method/mock_input_method_manager.h +++ b/chrome/browser/chromeos/input_method/mock_input_method_manager.h @@ -6,11 +6,11 @@ #define CHROME_BROWSER_CHROMEOS_INPUT_METHOD_MOCK_INPUT_METHOD_MANAGER_H_ #include "chrome/browser/chromeos/input_method/input_method_util.h" -#include "chromeos/ime/component_extension_ime_manager.h" -#include "chromeos/ime/fake_ime_keyboard.h" -#include "chromeos/ime/fake_input_method_delegate.h" -#include "chromeos/ime/input_method_manager.h" -#include "chromeos/ime/input_method_whitelist.h" +#include "ui/base/ime/chromeos/component_extension_ime_manager.h" +#include "ui/base/ime/chromeos/fake_ime_keyboard.h" +#include "ui/base/ime/chromeos/fake_input_method_delegate.h" +#include "ui/base/ime/chromeos/input_method_manager.h" +#include "ui/base/ime/chromeos/input_method_whitelist.h" namespace chromeos { namespace input_method { diff --git a/chrome/browser/chromeos/input_method/mode_indicator_browsertest.cc b/chrome/browser/chromeos/input_method/mode_indicator_browsertest.cc index 92fbb52..0ef434a 100644 --- a/chrome/browser/chromeos/input_method/mode_indicator_browsertest.cc +++ b/chrome/browser/chromeos/input_method/mode_indicator_browsertest.cc @@ -8,14 +8,14 @@ #include "chrome/browser/chromeos/input_method/input_method_util.h" #include "chrome/browser/chromeos/input_method/mode_indicator_controller.h" #include "chrome/test/base/in_process_browser_test.h" -#include "chromeos/ime/component_extension_ime_manager.h" -#include "chromeos/ime/extension_ime_util.h" -#include "chromeos/ime/input_method_manager.h" -#include "chromeos/ime/input_method_whitelist.h" #include "content/public/test/browser_test_utils.h" #include "content/public/test/test_utils.h" #include "testing/gtest/include/gtest/gtest.h" +#include "ui/base/ime/chromeos/component_extension_ime_manager.h" +#include "ui/base/ime/chromeos/extension_ime_util.h" #include "ui/base/ime/chromeos/ime_bridge.h" +#include "ui/base/ime/chromeos/input_method_manager.h" +#include "ui/base/ime/chromeos/input_method_whitelist.h" #include "ui/base/ime/input_method_factory.h" #include "ui/views/widget/widget.h" #include "ui/views/widget/widget_observer.h" diff --git a/chrome/browser/chromeos/input_method/mode_indicator_controller.h b/chrome/browser/chromeos/input_method/mode_indicator_controller.h index 502ff5a..1875168 100644 --- a/chrome/browser/chromeos/input_method/mode_indicator_controller.h +++ b/chrome/browser/chromeos/input_method/mode_indicator_controller.h @@ -6,7 +6,7 @@ #define CHROME_BROWSER_CHROMEOS_INPUT_METHOD_MODE_INDICATOR_CONTROLLER_H_ #include "base/memory/scoped_ptr.h" -#include "chromeos/ime/input_method_manager.h" +#include "ui/base/ime/chromeos/input_method_manager.h" #include "ui/gfx/rect.h" #include "ui/views/widget/widget_observer.h" |