Revert of Adds ozone support for ime keyboard. (patchset #7 id:120001 of...

Revert of Adds ozone support for ime keyboard. (patchset #7 id:120001 of https://codereview.chromium.org/683773002/)

Reason for revert:
Change doesn't compile on Linux ChromiumOS Ozone Builder

http://build.chromium.org/p/chromium.chromiumos/buildstatus?builder=Linux%20ChromiumOS%20Ozone%20Builder&number=6030

Original issue's description:
> Adds ozone support for ime keyboard.
>
> BUG=342336
>
> Committed: https://crrev.com/8be55caf3d38bba7645de143f7e6b8b655fdd36c
> Cr-Commit-Position: refs/heads/master@{#302057}

TBR=shuchen@chromium.org,fengyuan@chromium.org
NOTREECHECKS=true
NOTRY=true
BUG=342336

Review URL: https://codereview.chromium.org/689873004

Cr-Commit-Position: refs/heads/master@{#302062}

chromeos/chromeos.gyp

@@ -230,10 +230,10 @@
       'ime/extension_ime_util.h',
       'ime/fake_ime_keyboard.cc',
       'ime/fake_ime_keyboard.h',
-      'ime/ime_keyboard.cc',
       'ime/ime_keyboard.h',
-      'ime/ime_keyboard_x11.cc',
+      'ime/ime_keyboard_ozone.cc',
       'ime/ime_keyboard_x11.h',
+      'ime/ime_keyboard_x11.cc',
       'ime/input_method_delegate.h',
       'ime/input_method_descriptor.cc',
       'ime/input_method_descriptor.h',

chromeos/ime/fake_ime_keyboard.cc

@@ -9,12 +9,21 @@ namespace input_method {
 
 FakeImeKeyboard::FakeImeKeyboard()
     : set_current_keyboard_layout_by_name_count_(0),
+      caps_lock_is_enabled_(false),
       auto_repeat_is_enabled_(false) {
 }
 
 FakeImeKeyboard::~FakeImeKeyboard() {
 }
 
+void FakeImeKeyboard::AddObserver(Observer* observer) {
+  observers_.AddObserver(observer);
+}
+
+void FakeImeKeyboard::RemoveObserver(Observer* observer) {
+  observers_.RemoveObserver(observer);
+}
+
 bool FakeImeKeyboard::SetCurrentKeyboardLayoutByName(
     const std::string& layout_name) {
   ++set_current_keyboard_layout_by_name_count_;
@@ -22,24 +31,27 @@ bool FakeImeKeyboard::SetCurrentKeyboardLayoutByName(
   return true;
 }
 
-bool FakeImeKeyboard::SetAutoRepeatRate(const AutoRepeatRate& rate) {
-  last_auto_repeat_rate_ = rate;
+bool FakeImeKeyboard::ReapplyCurrentKeyboardLayout() {
   return true;
 }
 
-bool FakeImeKeyboard::SetAutoRepeatEnabled(bool enabled) {
-  auto_repeat_is_enabled_ = enabled;
-  return true;
+void FakeImeKeyboard::ReapplyCurrentModifierLockStatus() {
 }
 
-bool FakeImeKeyboard::ReapplyCurrentKeyboardLayout() {
-  return true;
+void FakeImeKeyboard::DisableNumLock() {
 }
 
-void FakeImeKeyboard::ReapplyCurrentModifierLockStatus() {
+void FakeImeKeyboard::SetCapsLockEnabled(bool enable_caps_lock) {
+  bool old_state = caps_lock_is_enabled_;
+  caps_lock_is_enabled_ = enable_caps_lock;
+  if (old_state != enable_caps_lock) {
+    FOR_EACH_OBSERVER(ImeKeyboard::Observer, observers_,
+                      OnCapsLockChanged(enable_caps_lock));
+  }
 }
 
-void FakeImeKeyboard::DisableNumLock() {
+bool FakeImeKeyboard::CapsLockIsEnabled() {
+  return caps_lock_is_enabled_;
 }
 
 bool FakeImeKeyboard::IsISOLevel5ShiftAvailable() const {
@@ -50,5 +62,15 @@ bool FakeImeKeyboard::IsAltGrAvailable() const {
   return false;
 }
 
+bool FakeImeKeyboard::SetAutoRepeatEnabled(bool enabled) {
+  auto_repeat_is_enabled_ = enabled;
+  return true;
+}
+
+bool FakeImeKeyboard::SetAutoRepeatRate(const AutoRepeatRate& rate) {
+  last_auto_repeat_rate_ = rate;
+  return true;
+}
+
 }  // namespace input_method
 }  // namespace chromeos

chromeos/ime/fake_ime_keyboard.h

@@ -10,6 +10,7 @@
 #include <string>
 
 #include "base/compiler_specific.h"
+#include "base/observer_list.h"
 #include "chromeos/chromeos_export.h"
 
 namespace chromeos {
@@ -20,22 +21,30 @@ class CHROMEOS_EXPORT FakeImeKeyboard : public ImeKeyboard {
   FakeImeKeyboard();
   virtual ~FakeImeKeyboard();
 
+  virtual void AddObserver(Observer* observer) override;
+  virtual void RemoveObserver(Observer* observer) override;
   virtual bool SetCurrentKeyboardLayoutByName(const std::string& layout_name)
       override;
-  virtual bool SetAutoRepeatRate(const AutoRepeatRate& rate) override;
-  virtual bool SetAutoRepeatEnabled(bool enabled) 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;
 
   int set_current_keyboard_layout_by_name_count_;
+  std::string last_layout_;
+  bool caps_lock_is_enabled_;
+  bool auto_repeat_is_enabled_;
   AutoRepeatRate last_auto_repeat_rate_;
   // TODO(yusukes): Add more variables for counting the numbers of the API calls
-  bool auto_repeat_is_enabled_;
 
  private:
+  ObserverList<Observer> observers_;
+
   DISALLOW_COPY_AND_ASSIGN(FakeImeKeyboard);
 };
 

chromeos/ime/ime_keyboard.cc

-// 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.
-
-#include "chromeos/ime/ime_keyboard.h"
-
-namespace chromeos {
-namespace input_method {
-namespace {
-
-const char *kISOLevel5ShiftLayoutIds[] = {
-  "ca(multix)",
-  "de(neo)",
-};
-
-const char *kAltGrLayoutIds[] = {
-  "be",
-  "be",
-  "be",
-  "bg",
-  "bg(phonetic)",
-  "br",
-  "ca",
-  "ca(eng)",
-  "ca(multix)",
-  "ch",
-  "ch(fr)",
-  "cz",
-  "de",
-  "de(neo)",
-  "dk",
-  "ee",
-  "es",
-  "es(cat)",
-  "fi",
-  "fr",
-  "gb(dvorak)",
-  "gb(extd)",
-  "gr",
-  "hr",
-  "il",
-  "it",
-  "latam",
-  "lt",
-  "no",
-  "pl",
-  "pt",
-  "ro",
-  "se",
-  "si",
-  "sk",
-  "tr",
-  "ua",
-  "us(altgr-intl)",
-  "us(intl)",
-};
-
-} // namespace
-
-ImeKeyboard::ImeKeyboard()
-    : caps_lock_is_enabled_(false) {
-}
-
-ImeKeyboard::~ImeKeyboard() {
-}
-
-void ImeKeyboard::AddObserver(Observer* observer) {
-  observers_.AddObserver(observer);
-}
-
-void ImeKeyboard::RemoveObserver(Observer* observer) {
-  observers_.RemoveObserver(observer);
-}
-
-void ImeKeyboard::SetCapsLockEnabled(bool enable_caps_lock) {
-  bool old_state = caps_lock_is_enabled_;
-  caps_lock_is_enabled_ = enable_caps_lock;
-  if (old_state != enable_caps_lock) {
-    FOR_EACH_OBSERVER(ImeKeyboard::Observer, observers_,
-                      OnCapsLockChanged(enable_caps_lock));
-  }
-}
-
-bool ImeKeyboard::CapsLockIsEnabled() {
-  return caps_lock_is_enabled_;
-}
-
-bool ImeKeyboard::IsISOLevel5ShiftAvailable() const {
-  for (size_t i = 0; i < arraysize(kISOLevel5ShiftLayoutIds); ++i) {
-    if (last_layout_ == kISOLevel5ShiftLayoutIds[i])
-      return true;
-  }
-  return false;
-}
-
-bool ImeKeyboard::IsAltGrAvailable() const {
-  for (size_t i = 0; i < arraysize(kAltGrLayoutIds); ++i) {
-    if (last_layout_ == kAltGrLayoutIds[i])
-      return true;
-  }
-  return false;
-}
-
-}  // namespace input_method
-}  // namespace chromeos

chromeos/ime/ime_keyboard.h

@@ -9,7 +9,6 @@
 #include <vector>
 
 #include "base/basictypes.h"
-#include "base/observer_list.h"
 #include "chromeos/chromeos_export.h"
 
 namespace chromeos {
@@ -43,11 +42,11 @@ class CHROMEOS_EXPORT ImeKeyboard {
     virtual void OnCapsLockChanged(bool enabled) = 0;
   };
 
-  ImeKeyboard();
-  virtual ~ImeKeyboard();
+  virtual ~ImeKeyboard() {}
+
   // Adds/removes observer.
-  virtual void AddObserver(Observer* observer);
-  virtual void RemoveObserver(Observer* observer);
+  virtual void AddObserver(Observer* observer) = 0;
+  virtual void RemoveObserver(Observer* observer) = 0;
 
   // Sets the current keyboard layout to |layout_name|. This function does not
   // change the current mapping of the modifier keys. Returns true on success.
@@ -75,17 +74,17 @@ class CHROMEOS_EXPORT ImeKeyboard {
 
   // Sets the caps lock status to |enable_caps_lock|. Do not call the function
   // from non-UI threads.
-  virtual void SetCapsLockEnabled(bool enable_caps_lock);
+  virtual void SetCapsLockEnabled(bool enable_caps_lock) = 0;
 
   // Returns true if caps lock is enabled. Do not call the function from non-UI
   // threads.
-  virtual bool CapsLockIsEnabled();
+  virtual bool CapsLockIsEnabled() = 0;
 
   // Returns true if the current layout supports ISO Level 5 shift.
-  virtual bool IsISOLevel5ShiftAvailable() const;
+  virtual bool IsISOLevel5ShiftAvailable() const = 0;
 
   // Returns true if the current layout supports alt gr.
-  virtual bool IsAltGrAvailable() const;
+  virtual bool IsAltGrAvailable() const = 0;
 
   // Turns on and off the auto-repeat of the keyboard. Returns true on success.
   // Do not call the function from non-UI threads.
@@ -112,12 +111,6 @@ class CHROMEOS_EXPORT ImeKeyboard {
   // Note: At this moment, classes other than InputMethodManager should not
   // instantiate the ImeKeyboard class.
   static ImeKeyboard* Create();
-
-  bool caps_lock_is_enabled_;
-  std::string last_layout_;
-
- protected:
-  ObserverList<Observer> observers_;
 };
 
 }  // namespace input_method

chromeos/ime/ime_keyboard_ozone.cc

@@ -2,63 +2,15 @@
 // 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_ozone.h"
+#include "chromeos/ime/fake_ime_keyboard.h"
+#include "chromeos/ime/ime_keyboard.h"
 
 namespace chromeos {
 namespace input_method {
 
-
-ImeKeyboardOzone::ImeKeyboardOzone()
-    : set_current_keyboard_layout_by_name_count_(0),
-      caps_lock_is_enabled_(false),
-      auto_repeat_is_enabled_(false) {
-}
-
-
-ImeKeyboardOzone::~ImeKeyboardOzone() {
-}
-
-bool ImeKeyboardOzone::SetCurrentKeyboardLayoutByName(
-    const std::string& layout_name) {
-  // Call SetKeyMapping here.
-  // TODO: parse out layout name and variation.
-  last_layout_ = layout_name;
-  return true;
-}
-
-void ImeKeyboardOzone::ReapplyCurrentKeyboardLayout() {
-  SetCurrentKeyboardLayoutByName(last_layout_);
-}
-
-void ImeKeyboardOzone::SetCapsLockEnabled(bool enable_caps_lock) {
-  // Call SetModifierStates here.
-  ImeKeyboard::SetCapsLockEnabled(enable_caps_lock);
-}
-
-bool ImeKeyboardOzone::CapsLockIsEnabled() {
-  // Call getModifierStates here.
-  return false;
-}
-
-void ImeKeyboardOzone::ReapplyCurrentModifierLockStatus() {
-  // call SetModifierStates here.
-}
-
-void ImeKeyboardOzone::DisableNumLock() {
-  SetCapsLockEnabled(caps_lock_is_enabled_);
-}
-
-bool ImeKeyboardOzone::SetAutoRepeatRate(const AutoRepeatRate& rate) {
-  return true;
-}
-
-bool ImeKeyboardOzone::SetAutoRepeatEnabled(bool enabled) {
-  return true;
-}
-
 // static
 ImeKeyboard* ImeKeyboard::Create() {
-  return new ImeKeyboardOzone();
+  return new FakeImeKeyboard;
 }
 
 }  // namespace input_method

chromeos/ime/ime_keyboard_ozone.h

-// 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 CHROMEOS_IME_FAKE_IME_KEYBOARD_H_
-#define CHROMEOS_IME_FAKE_IME_KEYBOARD_H_
-
-#include "chromeos/ime/ime_keyboard.h"
-
-#include <string>
-
-#include "base/compiler_specific.h"
-#include "chromeos/chromeos_export.h"
-
-namespace chromeos {
-namespace input_method {
-
-class ImeKeyboardOzone : public ImeKeyboard {
- public:
-  ImeKeyboardOzone();
-  virtual ~ImeKeyboardOzone();
-
-  virtual bool SetCurrentKeyboardLayoutByName(const std::string& layout_name)
-      override;
-  virtual bool SetAutoRepeatRate(const AutoRepeatRate& rate) override;
-  virtual bool SetAutoRepeatEnabled(bool enabled) 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;
-
- private:
-  DISALLOW_COPY_AND_ASSIGN(ImeKeyboardOzone);
-};
-
-}  // namespace input_method
-}  // namespace chromeos
-
-#endif  // CHROMEOS_IME_FAKE_IME_KEYBOARD_H_

chromeos/ime/ime_keyboard_x11.cc

@@ -19,6 +19,54 @@ const char kSetxkbmapCommand[] = "/usr/bin/setxkbmap";
 // A string for obtaining a mask value for Num Lock.
 const char kNumLockVirtualModifierString[] = "NumLock";
 
+const char *kISOLevel5ShiftLayoutIds[] = {
+  "ca(multix)",
+  "de(neo)",
+};
+
+const char *kAltGrLayoutIds[] = {
+  "be",
+  "be",
+  "be",
+  "bg",
+  "bg(phonetic)",
+  "br",
+  "ca",
+  "ca(eng)",
+  "ca(multix)",
+  "ch",
+  "ch(fr)",
+  "cz",
+  "de",
+  "de(neo)",
+  "dk",
+  "ee",
+  "es",
+  "es(cat)",
+  "fi",
+  "fr",
+  "gb(dvorak)",
+  "gb(extd)",
+  "gr",
+  "hr",
+  "il",
+  "it",
+  "latam",
+  "lt",
+  "no",
+  "pl",
+  "pt",
+  "ro",
+  "se",
+  "si",
+  "sk",
+  "tr",
+  "ua",
+  "us(altgr-intl)",
+  "us(intl)",
+};
+
+
 // Returns false if |layout_name| contains a bad character.
 bool CheckLayoutName(const std::string& layout_name) {
   static const char kValidLayoutNameCharacters[] =
@@ -38,8 +86,6 @@ bool CheckLayoutName(const std::string& layout_name) {
   return true;
 }
 
-}  // namespace
-
 ImeKeyboardX11::ImeKeyboardX11()
     : is_running_on_chrome_os_(base::SysInfo::IsRunningOnChromeOS()),
       weak_factory_(this) {
@@ -58,13 +104,21 @@ ImeKeyboardX11::ImeKeyboardX11()
         << "NumLock is not assigned to Mod2Mask.  : " << num_lock_mask_;
   }
 
-  caps_lock_is_enabled_ = CapsLockIsEnabled();
+  current_caps_lock_status_ = CapsLockIsEnabled();
   // Disable Num Lock on X start up for http://crosbug.com/29169.
   DisableNumLock();
 }
 
 ImeKeyboardX11::~ImeKeyboardX11() {};
 
+void ImeKeyboardX11::AddObserver(Observer* observer) {
+  observers_.AddObserver(observer);
+}
+
+void ImeKeyboardX11::RemoveObserver(Observer* observer) {
+  observers_.RemoveObserver(observer);
+}
+
 unsigned int ImeKeyboardX11::GetNumLockMask() {
   DCHECK(thread_checker_.CalledOnValidThread());
   static const unsigned int kBadMask = 0;
@@ -108,7 +162,7 @@ void ImeKeyboardX11::SetLockedModifiers(bool caps_lock_enabled) {
 
   affect_mask |= LockMask;
   value_mask |= (caps_lock_enabled ? LockMask : 0);
-  caps_lock_is_enabled_ = caps_lock_enabled;
+  current_caps_lock_status_ = caps_lock_enabled;
 
   XkbLockModifiers(gfx::GetXDisplay(), XkbUseCoreKbd, affect_mask, value_mask);
 }
@@ -124,7 +178,7 @@ bool ImeKeyboardX11::SetLayoutInternal(const std::string& layout_name,
   if (!CheckLayoutName(layout_name))
     return false;
 
-  if (!force && (last_layout_ == layout_name)) {
+  if (!force && (current_layout_name_ == layout_name)) {
     DVLOG(1) << "The requested layout is already set: " << layout_name;
     return true;
   }
@@ -211,6 +265,22 @@ bool ImeKeyboardX11::CapsLockIsEnabled() {
   return (status.locked_mods & LockMask);
 }
 
+bool ImeKeyboardX11::IsISOLevel5ShiftAvailable() const {
+  for (size_t i = 0; i < arraysize(kISOLevel5ShiftLayoutIds); ++i) {
+    if (current_layout_name_ == kISOLevel5ShiftLayoutIds[i])
+      return true;
+  }
+  return false;
+}
+
+bool ImeKeyboardX11::IsAltGrAvailable() const {
+  for (size_t i = 0; i < arraysize(kAltGrLayoutIds); ++i) {
+    if (current_layout_name_ == kAltGrLayoutIds[i])
+      return true;
+  }
+  return false;
+}
+
 bool ImeKeyboardX11::SetAutoRepeatEnabled(bool enabled) {
   if (enabled)
     XAutoRepeatOn(gfx::GetXDisplay());
@@ -234,7 +304,7 @@ bool ImeKeyboardX11::SetAutoRepeatRate(const AutoRepeatRate& rate) {
 }
 
 void ImeKeyboardX11::SetCapsLockEnabled(bool enable_caps_lock) {
-  bool old_state = caps_lock_is_enabled_;
+  bool old_state = current_caps_lock_status_;
   SetLockedModifiers(enable_caps_lock);
   if (old_state != enable_caps_lock) {
     FOR_EACH_OBSERVER(ImeKeyboard::Observer, observers_,
@@ -245,26 +315,26 @@ void ImeKeyboardX11::SetCapsLockEnabled(bool enable_caps_lock) {
 bool ImeKeyboardX11::SetCurrentKeyboardLayoutByName(
     const std::string& layout_name) {
   if (SetLayoutInternal(layout_name, false)) {
-    last_layout_ = layout_name;
+    current_layout_name_ = layout_name;
     return true;
   }
   return false;
 }
 
 bool ImeKeyboardX11::ReapplyCurrentKeyboardLayout() {
-  if (last_layout_.empty()) {
+  if (current_layout_name_.empty()) {
     DVLOG(1) << "Can't reapply XKB layout: layout unknown";
     return false;
   }
-  return SetLayoutInternal(last_layout_, true /* force */);
+  return SetLayoutInternal(current_layout_name_, true /* force */);
 }
 
 void ImeKeyboardX11::ReapplyCurrentModifierLockStatus() {
-  SetLockedModifiers(caps_lock_is_enabled_);
+  SetLockedModifiers(current_caps_lock_status_);
 }
 
 void ImeKeyboardX11::DisableNumLock() {
-  SetCapsLockEnabled(caps_lock_is_enabled_);
+  SetCapsLockEnabled(current_caps_lock_status_);
 }
 
 void ImeKeyboardX11::OnSetLayoutFinish() {
@@ -277,6 +347,8 @@ void ImeKeyboardX11::OnSetLayoutFinish() {
   MaybeExecuteSetLayoutCommand();
 }
 
+}  // namespace
+
 // static
 bool ImeKeyboard::GetAutoRepeatEnabledForTesting() {
   XKeyboardState state = {};

chromeos/ime/ime_keyboard_x11.h

@@ -38,6 +38,10 @@ 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;
@@ -46,6 +50,8 @@ 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;
 
@@ -75,6 +81,12 @@ 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_;
 
@@ -82,6 +94,8 @@ class ImeKeyboardX11 : public ImeKeyboard {
 
   base::WeakPtrFactory<ImeKeyboardX11> weak_factory_;
 
+  ObserverList<Observer> observers_;
+
   DISALLOW_COPY_AND_ASSIGN(ImeKeyboardX11);
 };