| Index: ui/base/ime/mock_ime_input_context_handler.h
|
| diff --git a/ui/base/ime/chromeos/mock_ime_input_context_handler.h b/ui/base/ime/mock_ime_input_context_handler.h
|
| similarity index 78%
|
| rename from ui/base/ime/chromeos/mock_ime_input_context_handler.h
|
| rename to ui/base/ime/mock_ime_input_context_handler.h
|
| index 78dec9020d650f996ae36b1462d9608317542bc6..2bad0b14a09f41ec06c655369356cf312c7ed681 100644
|
| --- a/ui/base/ime/chromeos/mock_ime_input_context_handler.h
|
| +++ b/ui/base/ime/mock_ime_input_context_handler.h
|
| @@ -2,8 +2,8 @@
|
| // Use of this source code is governed by a BSD-style license that can be
|
| // found in the LICENSE file.
|
|
|
| -#ifndef UI_BASE_IME_CHROMEOS_MOCK_IME_INPUT_CONTEXT_HANDLER_H_
|
| -#define UI_BASE_IME_CHROMEOS_MOCK_IME_INPUT_CONTEXT_HANDLER_H_
|
| +#ifndef UI_BASE_IME_MOCK_IME_INPUT_CONTEXT_HANDLER_H_
|
| +#define UI_BASE_IME_MOCK_IME_INPUT_CONTEXT_HANDLER_H_
|
|
|
| #include <stdint.h>
|
|
|
| @@ -11,13 +11,13 @@
|
| #include "ui/base/ime/ime_input_context_handler_interface.h"
|
| #include "ui/base/ime/ui_base_ime_export.h"
|
|
|
| -namespace chromeos {
|
| +namespace ui {
|
|
|
| class UI_BASE_IME_EXPORT MockIMEInputContextHandler
|
| - : public ui::IMEInputContextHandlerInterface {
|
| + : public IMEInputContextHandlerInterface {
|
| public:
|
| struct UpdateCompositionTextArg {
|
| - ui::CompositionText composition_text;
|
| + CompositionText composition_text;
|
| uint32_t cursor_pos;
|
| bool is_visible;
|
| };
|
| @@ -31,7 +31,7 @@ class UI_BASE_IME_EXPORT MockIMEInputContextHandler
|
| virtual ~MockIMEInputContextHandler();
|
|
|
| void CommitText(const std::string& text) override;
|
| - void UpdateCompositionText(const ui::CompositionText& text,
|
| + void UpdateCompositionText(const CompositionText& text,
|
| uint32_t cursor_pos,
|
| bool visible) override;
|
| void DeleteSurroundingText(int32_t offset, uint32_t length) override;
|
| @@ -46,9 +46,7 @@ class UI_BASE_IME_EXPORT MockIMEInputContextHandler
|
| return delete_surrounding_text_call_count_;
|
| }
|
|
|
| - const std::string& last_commit_text() const {
|
| - return last_commit_text_;
|
| - };
|
| + const std::string& last_commit_text() const { return last_commit_text_; };
|
|
|
| const UpdateCompositionTextArg& last_update_composition_arg() const {
|
| return last_update_composition_arg_;
|
| @@ -70,6 +68,6 @@ class UI_BASE_IME_EXPORT MockIMEInputContextHandler
|
| DeleteSurroundingTextArg last_delete_surrounding_text_arg_;
|
| };
|
|
|
| -} // namespace chromeos
|
| +} // namespace ui
|
|
|
| -#endif // UI_BASE_IME_CHROMEOS_MOCK_IME_INPUT_CONTEXT_HANDLER_H_
|
| +#endif // UI_BASE_IME_MOCK_IME_INPUT_CONTEXT_HANDLER_H_
|
|
|