Adds ozone support for ime keyboard.

chromeos/ime/ime_keyboard_x11.cc

Index: chromeos/ime/ime_keyboard_x11.cc
diff --git a/chromeos/ime/ime_keyboard_x11.cc b/chromeos/ime/ime_keyboard_x11.cc
index 775287c1237e41ada8176305b4117faa5611a95e..fdb4f74be82b544c73686bfad8d6e668ed9a670d 100644
--- a/chromeos/ime/ime_keyboard_x11.cc
+++ b/chromeos/ime/ime_keyboard_x11.cc
@@ -19,54 +19,6 @@ 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[] =
@@ -86,6 +38,8 @@ bool CheckLayoutName(const std::string& layout_name) {
   return true;
 }
 
+}  // namespace
+
 ImeKeyboardX11::ImeKeyboardX11()
     : is_running_on_chrome_os_(base::SysInfo::IsRunningOnChromeOS()),
       weak_factory_(this) {
@@ -104,20 +58,12 @@ ImeKeyboardX11::ImeKeyboardX11()
         << "NumLock is not assigned to Mod2Mask.  : " << num_lock_mask_;
   }
 
-  current_caps_lock_status_ = CapsLockIsEnabled();
+  caps_lock_is_enabled_ = 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);
-}
+ImeKeyboardX11::~ImeKeyboardX11() {}
 
 unsigned int ImeKeyboardX11::GetNumLockMask() {
   DCHECK(thread_checker_.CalledOnValidThread());
@@ -162,7 +108,7 @@ void ImeKeyboardX11::SetLockedModifiers(bool caps_lock_enabled) {
 
   affect_mask |= LockMask;
   value_mask |= (caps_lock_enabled ? LockMask : 0);
-  current_caps_lock_status_ = caps_lock_enabled;
+  caps_lock_is_enabled_ = caps_lock_enabled;

[Shu Chen, 2014/11/04 06:17:08]

replace this with SetCapsLockEnabled(caps_lock_enabled);

[FengYuan, 2014/11/04 07:11:19]

nope, we can't. that will cause recursive problems, SetCapsLockEnabled will call
this method, and it calls that back again.

 
   XkbLockModifiers(gfx::GetXDisplay(), XkbUseCoreKbd, affect_mask, value_mask);
 }
@@ -178,7 +124,7 @@ bool ImeKeyboardX11::SetLayoutInternal(const std::string& layout_name,
   if (!CheckLayoutName(layout_name))
     return false;
 
-  if (!force && (current_layout_name_ == layout_name)) {
+  if (!force && (last_layout_ == layout_name)) {
     DVLOG(1) << "The requested layout is already set: " << layout_name;
     return true;
   }
@@ -265,22 +211,6 @@ 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());
@@ -304,7 +234,7 @@ bool ImeKeyboardX11::SetAutoRepeatRate(const AutoRepeatRate& rate) {
 }
 
 void ImeKeyboardX11::SetCapsLockEnabled(bool enable_caps_lock) {
-  bool old_state = current_caps_lock_status_;
+  bool old_state = caps_lock_is_enabled_;
   SetLockedModifiers(enable_caps_lock);
   if (old_state != enable_caps_lock) {
     FOR_EACH_OBSERVER(ImeKeyboard::Observer, observers_,
@@ -315,26 +245,26 @@ void ImeKeyboardX11::SetCapsLockEnabled(bool enable_caps_lock) {
 bool ImeKeyboardX11::SetCurrentKeyboardLayoutByName(
     const std::string& layout_name) {
   if (SetLayoutInternal(layout_name, false)) {
-    current_layout_name_ = layout_name;
+    last_layout_ = layout_name;
     return true;
   }
   return false;
 }
 
 bool ImeKeyboardX11::ReapplyCurrentKeyboardLayout() {
-  if (current_layout_name_.empty()) {
+  if (last_layout_.empty()) {
     DVLOG(1) << "Can't reapply XKB layout: layout unknown";
     return false;
   }
-  return SetLayoutInternal(current_layout_name_, true /* force */);
+  return SetLayoutInternal(last_layout_, true /* force */);
 }
 
 void ImeKeyboardX11::ReapplyCurrentModifierLockStatus() {
-  SetLockedModifiers(current_caps_lock_status_);
+  SetLockedModifiers(caps_lock_is_enabled_);
 }
 
 void ImeKeyboardX11::DisableNumLock() {
-  SetCapsLockEnabled(current_caps_lock_status_);
+  SetCapsLockEnabled(caps_lock_is_enabled_);
 }
 
 void ImeKeyboardX11::OnSetLayoutFinish() {
@@ -347,8 +277,6 @@ void ImeKeyboardX11::OnSetLayoutFinish() {
   MaybeExecuteSetLayoutCommand();
 }
 
-}  // namespace
-
 // static
 bool ImeKeyboard::GetAutoRepeatEnabledForTesting() {
   XKeyboardState state = {};