| Index: chromeos/ime/ime_keyboard_x11.h
|
| diff --git a/chromeos/ime/ime_keyboard_x11.h b/chromeos/ime/ime_keyboard_x11.h
|
| index 10ac01a1159c4e8b932cbf802426f5c71a44ed32..e267d674d9df3723e7467dc907f9bf69f140e91b 100644
|
| --- a/chromeos/ime/ime_keyboard_x11.h
|
| +++ b/chromeos/ime/ime_keyboard_x11.h
|
| @@ -2,6 +2,8 @@
|
| // Use of this source code is governed by a BSD-style license that can be
|
| // found in the LICENSE file.
|
|
|
| +#ifndef CHROMEOS_IME_IME_KEYBOARD_X11_H_
|
| +#define CHROMEOS_IME_IME_KEYBOARD_X11_H_
|
|
|
| #include "chromeos/ime/ime_keyboard.h"
|
|
|
| @@ -38,10 +40,6 @@ class ImeKeyboardX11 : public ImeKeyboard {
|
| ImeKeyboardX11();
|
| virtual ~ImeKeyboardX11();
|
|
|
| - // Adds/removes observer.
|
| - virtual void AddObserver(Observer* observer) override;
|
| - virtual void RemoveObserver(Observer* observer) override;
|
| -
|
| // ImeKeyboard:
|
| virtual bool SetCurrentKeyboardLayoutByName(
|
| const std::string& layout_name) override;
|
| @@ -50,8 +48,6 @@ class ImeKeyboardX11 : public ImeKeyboard {
|
| virtual void DisableNumLock() override;
|
| virtual void SetCapsLockEnabled(bool enable_caps_lock) override;
|
| virtual bool CapsLockIsEnabled() override;
|
| - virtual bool IsISOLevel5ShiftAvailable() const override;
|
| - virtual bool IsAltGrAvailable() const override;
|
| virtual bool SetAutoRepeatEnabled(bool enabled) override;
|
| virtual bool SetAutoRepeatRate(const AutoRepeatRate& rate) override;
|
|
|
| @@ -81,12 +77,6 @@ class ImeKeyboardX11 : public ImeKeyboard {
|
| const bool is_running_on_chrome_os_;
|
| unsigned int num_lock_mask_;
|
|
|
| - // The current Caps Lock status. If true, enabled.
|
| - bool current_caps_lock_status_;
|
| -
|
| - // The XKB layout name which we set last time like "us" and "us(dvorak)".
|
| - std::string current_layout_name_;
|
| -
|
| // A queue for executing setxkbmap one by one.
|
| std::queue<std::string> execute_queue_;
|
|
|
| @@ -94,8 +84,6 @@ class ImeKeyboardX11 : public ImeKeyboard {
|
|
|
| base::WeakPtrFactory<ImeKeyboardX11> weak_factory_;
|
|
|
| - ObserverList<Observer> observers_;
|
| -
|
| DISALLOW_COPY_AND_ASSIGN(ImeKeyboardX11);
|
| };
|
|
|
| @@ -105,3 +93,4 @@ class ImeKeyboardX11 : public ImeKeyboard {
|
| } // namespace input_method
|
| } // namespace chromeos
|
|
|
| +#endif // CHROMEOS_IME_IME_KEYBOARD_X11_H_
|
|
|