| Index: ui/base/ime/input_method_android.h
|
| diff --git a/ui/base/ime/input_method_minimal.h b/ui/base/ime/input_method_android.h
|
| similarity index 56%
|
| copy from ui/base/ime/input_method_minimal.h
|
| copy to ui/base/ime/input_method_android.h
|
| index 60d1a8e23f95cb6e7554e3497b940083958a05bd..edadf7378d6a6d285c323b5b013b10f5d29985e0 100644
|
| --- a/ui/base/ime/input_method_minimal.h
|
| +++ b/ui/base/ime/input_method_android.h
|
| @@ -1,21 +1,22 @@
|
| -// Copyright 2013 The Chromium Authors. All rights reserved.
|
| +// Copyright 2015 The Chromium Authors. All rights reserved.
|
| // Use of this source code is governed by a BSD-style license that can be
|
| // found in the LICENSE file.
|
|
|
| -#ifndef UI_BASE_IME_INPUT_METHOD_MINIMAL_H_
|
| -#define UI_BASE_IME_INPUT_METHOD_MINIMAL_H_
|
| +#ifndef UI_BASE_IME_INPUT_METHOD_ANDROID_H_
|
| +#define UI_BASE_IME_INPUT_METHOD_ANDROID_H_
|
|
|
| +#include "base/macros.h"
|
| #include "ui/base/ime/input_method_base.h"
|
|
|
| namespace ui {
|
|
|
| -// A minimal implementation of ui::InputMethod, which supports only the direct
|
| -// input without any compositions or conversions.
|
| -class UI_BASE_IME_EXPORT InputMethodMinimal : public InputMethodBase {
|
| +// A ui::InputMethod implementation for Aura on Android platform.
|
| +class UI_BASE_IME_EXPORT InputMethodAndroid : public InputMethodBase {
|
| public:
|
| - explicit InputMethodMinimal(internal::InputMethodDelegate* delegate);
|
| - ~InputMethodMinimal() override;
|
| + explicit InputMethodAndroid(internal::InputMethodDelegate* delegate);
|
| + ~InputMethodAndroid() override;
|
|
|
| + private:
|
| // Overriden from InputMethod.
|
| bool OnUntranslatedIMEMessage(const base::NativeEvent& event,
|
| NativeEventResult* result) override;
|
| @@ -26,10 +27,10 @@ class UI_BASE_IME_EXPORT InputMethodMinimal : public InputMethodBase {
|
| std::string GetInputLocale() override;
|
| bool IsCandidatePopupOpen() const override;
|
|
|
| - private:
|
| - DISALLOW_COPY_AND_ASSIGN(InputMethodMinimal);
|
| + DISALLOW_COPY_AND_ASSIGN(InputMethodAndroid);
|
| };
|
|
|
| } // namespace ui
|
|
|
| -#endif // UI_BASE_IME_INPUT_METHOD_MINIMAL_H_
|
| +#endif // UI_BASE_IME_INPUT_METHOD_ANDROID_H_
|
| +
|
|
|