Add Canadian Multilingual Keyboard as Caps rewrite exception.

chrome/browser/ui/ash/event_rewriter.cc

 // Copyright (c) 2012 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 "chrome/browser/ui/ash/event_rewriter.h"
 
 #include <vector>
 
 #include "ash/shell.h"
 #include "base/logging.h"
@@ skipping 26 matching lines @@
 #include "ui/base/keycodes/keyboard_code_conversion_x.h"
 #include "ui/base/x/x11_util.h"
 #endif
 
 namespace {
 
 const int kBadDeviceId = -1;
 
 #if defined(OS_CHROMEOS)
 const char kNeo2LayoutId[] = "xkb:de:neo:ger";
+const char kCaMultixLayoutId[] = "xkb:ca:multix:fra";
 
 // A key code and a flag we should use when a key is remapped to |remap_to|.
 const struct ModifierRemapping {
   int remap_to;
   int flag;
   unsigned int native_modifier;
   ui::KeyboardCode keycode;
   KeySym native_keysyms[4];  // left, right, shift+left, shift+right.
 } kModifierRemappings[] = {
   { chromeos::input_method::kSearchKey, 0, Mod4Mask, ui::VKEY_LWIN,
@@ skipping 60 matching lines @@
 bool HasDiamondKey() {
   return CommandLine::ForCurrentProcess()->HasSwitch(
       chromeos::switches::kHasChromeOSDiamondKey);
 }
 
 bool IsMod3UsedByCurrentInputMethod() {
   // Since both German Neo2 XKB layout and Caps Lock depend on Mod3Mask,
   // it's not possible to make both features work. For now, we don't remap
   // Mod3Mask when Neo2 is in use.
   // TODO(yusukes): Remove the restriction.
-  return chromeos::input_method::InputMethodManager::Get()
-      ->GetCurrentInputMethod().id() == kNeo2LayoutId;
+  chromeos::input_method::InputMethodManager* manager =
+      chromeos::input_method::InputMethodManager::Get();
+  return manager->GetCurrentInputMethod().id() == kNeo2LayoutId ||
+      manager->GetCurrentInputMethod().id() == kCaMultixLayoutId;
+
 }
 #endif
 
 const PrefService* GetPrefService() {
   Profile* profile = ProfileManager::GetDefaultProfile();
   if (profile)
     return profile->GetPrefs();
   return NULL;
 }
 
@@ skipping 859 matching lines @@
   const DeviceType type = EventRewriter::GetDeviceType(device_name);
   if (type == kDeviceAppleKeyboard) {
     VLOG(1) << "Apple keyboard '" << device_name << "' connected: "
             << "id=" << device_id;
   }
   // Always overwrite the existing device_id since the X server may reuse a
   // device id for an unattached device.
   device_id_to_type_[device_id] = type;
   return type;
 }