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/mode_indicator_browsertest.cc | |
| 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/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" |