diff options
| author | shuchen <shuchen@chromium.org> | 2014-11-26 23:07:19 -0800 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2014-11-27 07:07:46 +0000 |
| commit | 9917a3671cafa9d31a071a530b9ce10ce0661bc9 (patch) | |
| tree | a45ad3e8163b6cc39a55636c2052f878601536b1 /chrome/browser/chromeos/input_method/mode_indicator_browsertest.cc | |
| parent | f0d33a1f7438a537321c2ea5db30dab1a99855a2 (diff) | |
| download | chromium_src-9917a3671cafa9d31a071a530b9ce10ce0661bc9.zip chromium_src-9917a3671cafa9d31a071a530b9ce10ce0661bc9.tar.gz chromium_src-9917a3671cafa9d31a071a530b9ce10ce0661bc9.tar.bz2 | |
Moves code from chromeos/ime to ui/base/ime/chromeos.
This is because the code under chromeos/ime has inappropriate dependencies to src/ui.
This cl doesn't include any logic changes in code, and only contains changes of moving files, changing includes, and necessary changes in GYPs and build rules.
Note:
1) the input_methods.txt & gen_input_methods.py remain unchanged because auto-test requires input_methods.txt file to be available, and input_method_whitelist needs the generated input_methods.h for compile. It could be moved in later CLs.
2) We've been discussing the naming for ui/chromeos/ime, which could be renamed to something for "views". It can be done in a separated cl.
TBR=sky@chromium.org
BUG=431863
TEST=Verified on linux_chromeos.
Review URL: https://codereview.chromium.org/727143002
Cr-Commit-Position: refs/heads/master@{#305964}
Diffstat (limited to 'chrome/browser/chromeos/input_method/mode_indicator_browsertest.cc')
| -rw-r--r-- | chrome/browser/chromeos/input_method/mode_indicator_browsertest.cc | 8 |
1 files changed, 4 insertions, 4 deletions
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" |