| Index: ui/base/ime/input_method_auraandroid.h
|
| diff --git a/mandoline/ui/aura/input_method_mandoline.h b/ui/base/ime/input_method_auraandroid.h
|
| similarity index 63%
|
| copy from mandoline/ui/aura/input_method_mandoline.h
|
| copy to ui/base/ime/input_method_auraandroid.h
|
| index 9da4653d5de1cf53db513fbadb26ca801b93dd68..fdfed60e581050a2f9af1d49c9bc7a54bb2c6e1e 100644
|
| --- a/mandoline/ui/aura/input_method_mandoline.h
|
| +++ b/ui/base/ime/input_method_auraandroid.h
|
| @@ -4,15 +4,15 @@
|
|
|
| #include "ui/base/ime/input_method_base.h"
|
|
|
| -#ifndef MANDOLINE_UI_AURA_INPUT_METHOD_MANDOLINE_H_
|
| -#define MANDOLINE_UI_AURA_INPUT_METHOD_MANDOLINE_H_
|
| +#ifndef UI_BASE_IME_INPUT_METHOD_AURAANDROID_H_
|
| +#define UI_BASE_IME_INPUT_METHOD_AURAANDROID_H_
|
|
|
| -namespace mandoline {
|
| +namespace ui {
|
|
|
| -class InputMethodMandoline : public ui::InputMethodBase {
|
| +class InputMethodAuraAndroid : public InputMethodBase {
|
| public:
|
| - explicit InputMethodMandoline(ui::internal::InputMethodDelegate* delegate);
|
| - ~InputMethodMandoline() override;
|
| + explicit InputMethodAuraAndroid(ui::internal::InputMethodDelegate* delegate);
|
| + ~InputMethodAuraAndroid() override;
|
|
|
| private:
|
| // Overridden from ui::InputMethod:
|
| @@ -25,9 +25,9 @@ class InputMethodMandoline : public ui::InputMethodBase {
|
| std::string GetInputLocale() override;
|
| bool IsCandidatePopupOpen() const override;
|
|
|
| - DISALLOW_COPY_AND_ASSIGN(InputMethodMandoline);
|
| + DISALLOW_COPY_AND_ASSIGN(InputMethodAuraAndroid);
|
| };
|
|
|
| -} // namespace mandoline
|
| +} // namespace ui
|
|
|
| -#endif // MANDOLINE_UI_AURA_INPUT_METHOD_MANDOLINE_H_
|
| +#endif // UI_BASE_IME_INPUT_METHOD_AURAANDROID_H_
|
|
|