diff options
| author | azurewei <azurewei@chromium.org> | 2015-10-19 02:47:28 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-10-19 09:48:18 +0000 |
| commit | 7fb425e4d725bdf1c89462e10a6464d9afffef50 (patch) | |
| tree | cb40ccc2a57c2070eed78c00d37b692bbad2d382 /chrome/browser/chromeos/input_method/mode_indicator_browsertest.cc | |
| parent | a25a45de316b03a1e6415aff5d07226dc7240b82 (diff) | |
| download | chromium_src-7fb425e4d725bdf1c89462e10a6464d9afffef50.zip chromium_src-7fb425e4d725bdf1c89462e10a6464d9afffef50.tar.gz chromium_src-7fb425e4d725bdf1c89462e10a6464d9afffef50.tar.bz2 | |
Make ChromeOS IME APIs platform-independent, step 1 of X: Move ui/base/ime/chromeos/ime_bridge(.cc/.h) to ui/base/ime/
Main changes:
1. Delete ui/base/ime/chromeos/ime_brige(.cc/.h).
2. Define classes ui::IMEBridge, ui::IMEInputContextHandlerInterface, ui::IMEInputEngineInterface using separated files under ui/base/ime/
3. Keep chromeos::IMECandidateWindowHandlerInterface under ui/base/ime/chromeos
4. Update all related file including and namespace using.
BUG=517773
TEST=No compiling errors.
Review URL: https://codereview.chromium.org/1403543004
Cr-Commit-Position: refs/heads/master@{#354748}
Diffstat (limited to 'chrome/browser/chromeos/input_method/mode_indicator_browsertest.cc')
| -rw-r--r-- | chrome/browser/chromeos/input_method/mode_indicator_browsertest.cc | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/chrome/browser/chromeos/input_method/mode_indicator_browsertest.cc b/chrome/browser/chromeos/input_method/mode_indicator_browsertest.cc index e6a9189..83ecb9d 100644 --- a/chrome/browser/chromeos/input_method/mode_indicator_browsertest.cc +++ b/chrome/browser/chromeos/input_method/mode_indicator_browsertest.cc @@ -13,9 +13,10 @@ #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/ime_candidate_window_handler_interface.h" #include "ui/base/ime/chromeos/input_method_manager.h" #include "ui/base/ime/chromeos/input_method_whitelist.h" +#include "ui/base/ime/ime_bridge.h" #include "ui/base/ime/input_method_factory.h" #include "ui/views/widget/widget.h" #include "ui/views/widget/widget_observer.h" @@ -130,7 +131,7 @@ IN_PROC_BROWSER_TEST_F(ModeIndicatorBrowserTest, Bounds) { EXPECT_TRUE(imm->GetActiveIMEState()->CanCycleInputMethod()); chromeos::IMECandidateWindowHandlerInterface* candidate_window = - chromeos::IMEBridge::Get()->GetCandidateWindowHandler(); + ui::IMEBridge::Get()->GetCandidateWindowHandler(); candidate_window->FocusStateChanged(true); // Check if the size of the mode indicator is expected. @@ -199,7 +200,7 @@ IN_PROC_BROWSER_TEST_F(ModeIndicatorBrowserTest, NumOfWidgets) { EXPECT_TRUE(imm->GetActiveIMEState()->CanCycleInputMethod()); chromeos::IMECandidateWindowHandlerInterface* candidate_window = - chromeos::IMEBridge::Get()->GetCandidateWindowHandler(); + ui::IMEBridge::Get()->GetCandidateWindowHandler(); candidate_window->FocusStateChanged(true); { |