summaryrefslogtreecommitdiffstats
path: root/chrome/browser/chromeos
diff options
context:
space:
mode:
authorthomasvl@chromium.org <thomasvl@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-06-10 13:54:08 +0000
committerthomasvl@chromium.org <thomasvl@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-06-10 13:54:08 +0000
commitb7db70bef97d5d4951822c34834a84c5a2216b34 (patch)
tree41a9c6bc0e1376573755b2a38ed55a490a587891 /chrome/browser/chromeos
parent2c5e1e131287e37ab5d837a271ab3e55cea06120 (diff)
downloadchromium_src-b7db70bef97d5d4951822c34834a84c5a2216b34.zip
chromium_src-b7db70bef97d5d4951822c34834a84c5a2216b34.tar.gz
chromium_src-b7db70bef97d5d4951822c34834a84c5a2216b34.tar.bz2
This added to already failing browser_tests on the chromiumos builder on the waterfall.
Revert 49380 - Share the same keyboard layout among all windows. BUG=chromiumos:2433 TEST=manually Review URL: http://codereview.chromium.org/2781006 TBR=yusukes@google.com Review URL: http://codereview.chromium.org/2738007 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@49391 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, 0 insertions, 6 deletions
diff --git a/chrome/browser/chromeos/status/language_menu_button.cc b/chrome/browser/chromeos/status/language_menu_button.cc
index 447ff58..156bb66 100644
--- a/chrome/browser/chromeos/status/language_menu_button.cc
+++ b/chrome/browser/chromeos/status/language_menu_button.cc
@@ -17,7 +17,6 @@
#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):
//
@@ -163,11 +162,6 @@ 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();