Makes the default French keyboard as fr(oss) XKB layout.

Makes the default French keyboard as fr(oss) XKB layout.

It would be risky to modify the id "xkb:fr::fra" to "xkb:fr:oss:fra", because it is in VPD. So this cl just modify the layout which is kind of hacky.

This is the 2nd attempt for https://codereview.chromium.org/1436813009, which broke tests because it forgot to modify the whitelist for login layouts.

BUG=409835
TEST=The french keyboard by default is "fr(oss)" layout and
tests not fail as in crbug.com/555507.

Committed: https://crrev.com/8601888a7b5768aa9f4b6074dd9a0693587e1617
Cr-Commit-Position: refs/heads/master@{#360051}

[Shu Chen, 2015-11-17 08:24:44]

shuchen@chromium.org changed reviewers:
+ nona@chromium.org

[Shu Chen, 2015-11-17 08:24:44]

Nona, can you please help to review this cl? Thanks

[Shu Chen, 2015-11-17 08:26:03]

Description was changed from

==========
Makes the default French keyboard as fr(oss) XKB layout.

BUG=409835
TEST=The french keyboard by default is "fr(oss)" layout and
tests not fail as in crbug.com/555507.
==========

to

==========
Makes the default French keyboard as fr(oss) XKB layout.

It would be risky to modify the id "xkb:fr::fra" to "xkb:fr:oss:fra", because it
is in VPD. So this cl just modify the layout which is kind of hacky.

BUG=409835
TEST=The french keyboard by default is "fr(oss)" layout and
tests not fail as in crbug.com/555507.
==========

[Shu Chen, 2015-11-17 08:41:42]

Description was changed from

==========
Makes the default French keyboard as fr(oss) XKB layout.

It would be risky to modify the id "xkb:fr::fra" to "xkb:fr:oss:fra", because it
is in VPD. So this cl just modify the layout which is kind of hacky.

BUG=409835
TEST=The french keyboard by default is "fr(oss)" layout and
tests not fail as in crbug.com/555507.
==========

to

==========
Makes the default French keyboard as fr(oss) XKB layout.

It would be risky to modify the id "xkb:fr::fra" to "xkb:fr:oss:fra", because it
is in VPD. So this cl just modify the layout which is kind of hacky.

This is the 2nd attempt for https://codereview.chromium.org/1436813009, which
broke tests because it forgot to modify the whitelist for login layouts.

BUG=409835
TEST=The french keyboard by default is "fr(oss)" layout and
tests not fail as in crbug.com/555507.
==========

[Seigo Nonaka, 2015-11-17 08:42:12]

lgtm

[Shu Chen, 2015-11-17 08:42:39]

The CQ bit was checked by shuchen@chromium.org

[commit-bot: I haz the power, 2015-11-17 08:42:55]

CQ is trying da patch. Follow status at
 https://chromium-cq-status.appspot.com/patch-status/1455483002/1
View timeline at
 https://chromium-cq-status.appspot.com/patch-timeline/1455483002/1

[commit-bot: I haz the power, 2015-11-17 09:12:11]

The CQ bit was unchecked by commit-bot@chromium.org

[commit-bot: I haz the power, 2015-11-17 09:12:11]

Failed to apply patch for
ui/base/ime/chromeos/component_extension_ime_manager.cc:
While running git apply --index -3 -p1;
  error: patch failed:
ui/base/ime/chromeos/component_extension_ime_manager.cc:33
  Falling back to three-way merge...
  Applied patch to 'ui/base/ime/chromeos/component_extension_ime_manager.cc'
with conflicts.
  U ui/base/ime/chromeos/component_extension_ime_manager.cc

Patch:       ui/base/ime/chromeos/component_extension_ime_manager.cc
Index: ui/base/ime/chromeos/component_extension_ime_manager.cc
diff --git a/ui/base/ime/chromeos/component_extension_ime_manager.cc
b/ui/base/ime/chromeos/component_extension_ime_manager.cc
index
69f1d88ef74e8e65d90b22b965375ac68809c761..97ed38c619e032e11df73a908e7bf19555706f3d
100644
--- a/ui/base/ime/chromeos/component_extension_ime_manager.cc
+++ b/ui/base/ime/chromeos/component_extension_ime_manager.cc
@@ -33,6 +33,7 @@ const char* kLoginLayoutWhitelist[] = {
   "es(cat)",
   "fi",
   "fr",
+  "fr(oss)",
   "gb(dvorak)",
   "gb(extd)",
   "hr",

[commit-bot: I haz the power, 2015-11-17 09:12:36]

The CQ bit was unchecked by commit-bot@chromium.org

[Shu Chen, 2015-11-17 10:15:47]

The CQ bit was checked by shuchen@chromium.org

[Shu Chen, 2015-11-17 10:15:48]

The patchset sent to the CQ was uploaded after l-g-t-m from nona@chromium.org
Link to the patchset: https://codereview.chromium.org/1455483002/#ps20001
(title: "rebased.")

[commit-bot: I haz the power, 2015-11-17 10:16:26]

CQ is trying da patch. Follow status at
 https://chromium-cq-status.appspot.com/patch-status/1455483002/20001
View timeline at
 https://chromium-cq-status.appspot.com/patch-timeline/1455483002/20001

[commit-bot: I haz the power, 2015-11-17 10:43:57]

Committed patchset #2 (id:20001)

[commit-bot: I haz the power, 2015-11-17 10:44:46]

Patchset 2 (id:??) landed as
https://crrev.com/8601888a7b5768aa9f4b6074dd9a0693587e1617
Cr-Commit-Position: refs/heads/master@{#360051}