| Index: chromeos/ime/ime_keyboard_x11.cc
|
| diff --git a/chromeos/ime/ime_keyboard_x11.cc b/chromeos/ime/ime_keyboard_x11.cc
|
| index 22957074733ddd196f264d03fc5729c8e5052d4e..a419f31b4dc78358ced3487a608a8fe9c6135355 100644
|
| --- a/chromeos/ime/ime_keyboard_x11.cc
|
| +++ b/chromeos/ime/ime_keyboard_x11.cc
|
| @@ -2,30 +2,7 @@
|
| // Use of this source code is governed by a BSD-style license that can be
|
| // found in the LICENSE file.
|
|
|
| -#include "chromeos/ime/ime_keyboard.h"
|
| -
|
| -#include <cstdlib>
|
| -#include <cstring>
|
| -#include <queue>
|
| -#include <set>
|
| -#include <utility>
|
| -
|
| -#include "base/bind.h"
|
| -#include "base/logging.h"
|
| -#include "base/memory/scoped_ptr.h"
|
| -#include "base/message_loop/message_loop.h"
|
| -#include "base/process/kill.h"
|
| -#include "base/process/launch.h"
|
| -#include "base/process/process_handle.h"
|
| -#include "base/strings/string_util.h"
|
| -#include "base/strings/stringprintf.h"
|
| -#include "base/sys_info.h"
|
| -#include "base/threading/thread_checker.h"
|
| -#include "ui/gfx/x/x11_types.h"
|
| -
|
| -// These includes conflict with base/tracked_objects.h so must come last.
|
| -#include <X11/XKBlib.h>
|
| -#include <X11/Xlib.h>
|
| +#include "chromeos/ime/ime_keyboard_x11.h"
|
|
|
| namespace chromeos {
|
| namespace input_method {
|
| @@ -109,72 +86,6 @@ bool CheckLayoutName(const std::string& layout_name) {
|
| return true;
|
| }
|
|
|
| -class ImeKeyboardX11 : public ImeKeyboard {
|
| - public:
|
| - 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;
|
| - virtual bool ReapplyCurrentKeyboardLayout() override;
|
| - virtual void ReapplyCurrentModifierLockStatus() override;
|
| - 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;
|
| -
|
| - private:
|
| - // Returns a mask for Num Lock (e.g. 1U << 4). Returns 0 on error.
|
| - unsigned int GetNumLockMask();
|
| -
|
| - // Sets the caps-lock status. Note that calling this function always disables
|
| - // the num-lock.
|
| - void SetLockedModifiers(bool caps_lock_enabled);
|
| -
|
| - // This function is used by SetLayout() and RemapModifierKeys(). Calls
|
| - // setxkbmap command if needed, and updates the last_full_layout_name_ cache.
|
| - bool SetLayoutInternal(const std::string& layout_name, bool force);
|
| -
|
| - // Executes 'setxkbmap -layout ...' command asynchronously using a layout name
|
| - // in the |execute_queue_|. Do nothing if the queue is empty.
|
| - // TODO(yusukes): Use libxkbfile.so instead of the command (crosbug.com/13105)
|
| - void MaybeExecuteSetLayoutCommand();
|
| -
|
| - // Polls to see setxkbmap process exits.
|
| - void PollUntilChildFinish(const base::ProcessHandle handle);
|
| -
|
| - // Called when execve'd setxkbmap process exits.
|
| - void OnSetLayoutFinish();
|
| -
|
| - 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_;
|
| -
|
| - base::ThreadChecker thread_checker_;
|
| -
|
| - base::WeakPtrFactory<ImeKeyboardX11> weak_factory_;
|
| -
|
| - ObserverList<Observer> observers_;
|
| -
|
| - DISALLOW_COPY_AND_ASSIGN(ImeKeyboardX11);
|
| -};
|
| -
|
| ImeKeyboardX11::ImeKeyboardX11()
|
| : is_running_on_chrome_os_(base::SysInfo::IsRunningOnChromeOS()),
|
| weak_factory_(this) {
|
|
|