XKB RMLVO splitting.

ui/events/ozone/layout/xkb/xkb_keyboard_layout_engine.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 "ui/events/ozone/layout/xkb/xkb_keyboard_layout_engine.h"
 
 #include <xkbcommon/xkbcommon-names.h>
 
 #include "base/logging.h"
 #include "ui/events/event_constants.h"
@@ skipping 629 matching lines @@
 #if defined(OS_CHROMEOS)
   return true;
 #else
   return false;
 #endif
 }
 
 bool XkbKeyboardLayoutEngine::SetCurrentLayoutByName(
     const std::string& layout_name) {
 #if defined(OS_CHROMEOS)
-  size_t dash_index = layout_name.find("-");
-  size_t parentheses_index = layout_name.find("(");
+  size_t dash_index = layout_name.find('-');
+  size_t parentheses_index = layout_name.find('(');
   std::string layout_id = layout_name;
   std::string layout_variant = "";
-  if (dash_index != std::string::npos) {
+  if (parentheses_index != std::string::npos) {
+    layout_id = layout_name.substr(0, parentheses_index);
+    size_t close_index = layout_name.find(')', parentheses_index);
+    if (close_index == std::string::npos)
+      close_index = layout_name.size();
+    layout_variant = layout_name.substr(parentheses_index + 1,
+                                        close_index - parentheses_index - 1);
+  } else if (dash_index != std::string::npos) {
     layout_id = layout_name.substr(0, dash_index);
     layout_variant = layout_name.substr(dash_index + 1);
-  } else if (parentheses_index != std::string::npos) {
-    layout_id = layout_name.substr(0, parentheses_index);
-    layout_variant = layout_name.substr(parentheses_index + 1,
-                                        layout_name.size() - 1);
   }
   struct xkb_rule_names names = {
     .rules = NULL,
     .model = "pc101",
     .layout = layout_id.c_str(),
     .variant = layout_variant.c_str(),
     .options = ""
   };
   xkb_keymap* keymap = xkb_keymap_new_from_names(xkb_context_.get(),
                                                  &names,
@@ skipping 193 matching lines @@
   if (flags == base_flags)
     return base_character;
   xkb_keysym_t keysym;
   base::char16 character = 0;
   if (!XkbLookup(xkb_keycode, flags, &keysym, &character))
     character = kNone;
   return character;
 }
 
 }  // namespace ui