| Index: ui/base/ime/input_method_mac.h
|
| diff --git a/ui/base/ime/input_method_minimal.h b/ui/base/ime/input_method_mac.h
|
| similarity index 57%
|
| copy from ui/base/ime/input_method_minimal.h
|
| copy to ui/base/ime/input_method_mac.h
|
| index 84fd066be0cb4da32ba82556e1a91b17c4f914b3..08f60801e243d1a72e5e5e51f38b7f7e9883ba33 100644
|
| --- a/ui/base/ime/input_method_minimal.h
|
| +++ b/ui/base/ime/input_method_mac.h
|
| @@ -1,20 +1,22 @@
|
| -// Copyright 2013 The Chromium Authors. All rights reserved.
|
| +// Copyright 2014 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_MAC_H_
|
| +#define UI_BASE_IME_INPUT_METHOD_MAC_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_EXPORT InputMethodMinimal : public InputMethodBase {
|
| +// A ui::InputMethod implementation for Mac.
|
| +// On the Mac, key events don't pass through InputMethod.
|
| +// Instead, NSTextInputClient calls are bridged to the currently focused
|
| +// ui::TextInputClient object.
|
| +class UI_BASE_EXPORT InputMethodMac : public InputMethodBase {
|
| public:
|
| - explicit InputMethodMinimal(internal::InputMethodDelegate* delegate);
|
| - virtual ~InputMethodMinimal();
|
| + explicit InputMethodMac(internal::InputMethodDelegate* delegate);
|
| + virtual ~InputMethodMac();
|
|
|
| // Overriden from InputMethod.
|
| virtual bool OnUntranslatedIMEMessage(const base::NativeEvent& event,
|
| @@ -28,9 +30,9 @@ class UI_BASE_EXPORT InputMethodMinimal : public InputMethodBase {
|
| virtual bool IsCandidatePopupOpen() const OVERRIDE;
|
|
|
| private:
|
| - DISALLOW_COPY_AND_ASSIGN(InputMethodMinimal);
|
| + DISALLOW_COPY_AND_ASSIGN(InputMethodMac);
|
| };
|
|
|
| } // namespace ui
|
|
|
| -#endif // UI_BASE_IME_INPUT_METHOD_MINIMAL_H_
|
| +#endif // UI_BASE_IME_INPUT_METHOD_MAC_H_
|
|
|