summaryrefslogtreecommitdiffstats
path: root/chrome/browser/chromeos
diff options
context:
space:
mode:
authoryusukes@google.com <yusukes@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2010-06-10 10:20:28 +0000
committeryusukes@google.com <yusukes@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2010-06-10 10:20:28 +0000
commit4853ea362525b8385e71c4e220fd42ad9161dc39 (patch)
treeb409c4c8d670db5c58c3b5afd3d819a730772eef /chrome/browser/chromeos
parent8ee20f9ca588ad821ef38353f1d73d408c4247fb (diff)
downloadchromium_src-4853ea362525b8385e71c4e220fd42ad9161dc39.zip
chromium_src-4853ea362525b8385e71c4e220fd42ad9161dc39.tar.gz
chromium_src-4853ea362525b8385e71c4e220fd42ad9161dc39.tar.bz2
Share the same keyboard layout among all windows.
BUG=chromium-os:2433 TEST=manually Review URL: http://codereview.chromium.org/2781006 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@49380 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/chromeos')
-rw-r--r--chrome/browser/chromeos/status/language_menu_button.cc6
1 files changed, 6 insertions, 0 deletions
diff --git a/chrome/browser/chromeos/status/language_menu_button.cc b/chrome/browser/chromeos/status/language_menu_button.cc
index 156bb66..447ff58 100644
--- a/chrome/browser/chromeos/status/language_menu_button.cc
+++ b/chrome/browser/chromeos/status/language_menu_button.cc
@@ -17,6 +17,7 @@
#include "chrome/browser/profile.h"
#include "grit/generated_resources.h"
#include "grit/theme_resources.h"
+#include "third_party/cros/chromeos_keyboard.h"
// The language menu consists of 3 parts (in this order):
//
@@ -162,6 +163,11 @@ LanguageMenuButton::LanguageMenuButton(StatusAreaHost* host)
// initial OS boot).
UpdateIcon(L"EN", L"");
+ // Use the same keyboard layout on all windows.
+ if (CrosLibrary::Get()->EnsureLoaded()) {
+ SetKeyboardLayoutPerWindow(false);
+ }
+
// Sync current and previous input methods on Chrome prefs with ibus-daemon.
// InputMethodChanged() will be called soon and the indicator will be updated.
LanguageLibrary* library = CrosLibrary::Get()->GetLanguageLibrary();