| Index: ui/views/mus/input_method_mus.h
|
| diff --git a/mandoline/ui/aura/input_method_mandoline.h b/ui/views/mus/input_method_mus.h
|
| similarity index 72%
|
| rename from mandoline/ui/aura/input_method_mandoline.h
|
| rename to ui/views/mus/input_method_mus.h
|
| index 40a35a4e667396e5cdc4b2c71494da36696d7059..da17efa2bc1839a8e28f758bd01370bf10e88791 100644
|
| --- a/mandoline/ui/aura/input_method_mandoline.h
|
| +++ b/ui/views/mus/input_method_mus.h
|
| @@ -4,20 +4,19 @@
|
|
|
| #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_VIEWS_MUS_INPUT_METHOD_MUS_H_
|
| +#define UI_VIEWS_MUS_INPUT_METHOD_MUS_H_
|
|
|
| namespace mus {
|
| class View;
|
| } // namespace mojo
|
|
|
| -namespace mandoline {
|
| +namespace views {
|
|
|
| -class InputMethodMandoline : public ui::InputMethodBase {
|
| +class InputMethodMUS : public ui::InputMethodBase {
|
| public:
|
| - InputMethodMandoline(ui::internal::InputMethodDelegate* delegate,
|
| - mus::View* view);
|
| - ~InputMethodMandoline() override;
|
| + InputMethodMUS(ui::internal::InputMethodDelegate* delegate, mus::View* view);
|
| + ~InputMethodMUS() override;
|
|
|
| private:
|
| // Overridden from ui::InputMethod:
|
| @@ -42,9 +41,9 @@ class InputMethodMandoline : public ui::InputMethodBase {
|
| // The toplevel view which is not owned by this class.
|
| mus::View* view_;
|
|
|
| - DISALLOW_COPY_AND_ASSIGN(InputMethodMandoline);
|
| + DISALLOW_COPY_AND_ASSIGN(InputMethodMUS);
|
| };
|
|
|
| -} // namespace mandoline
|
| +} // namespace views
|
|
|
| -#endif // MANDOLINE_UI_AURA_INPUT_METHOD_MANDOLINE_H_
|
| +#endif // UI_VIEWS_MUS_INPUT_METHOD_MUS_H_
|
|
|