summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authoryusukes@chromium.org <yusukes@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-11-29 02:19:04 +0000
committeryusukes@chromium.org <yusukes@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-11-29 02:19:04 +0000
commit3545c69c3e9618bb923abaada5fc18fc01079e2d (patch)
tree1e834e8ce32a387cf69c8b85ce7e7b4ab86ed16a
parent185fb67fc5825be5a3f79faaadf3b083066b9dfb (diff)
downloadchromium_src-3545c69c3e9618bb923abaada5fc18fc01079e2d.zip
chromium_src-3545c69c3e9618bb923abaada5fc18fc01079e2d.tar.gz
chromium_src-3545c69c3e9618bb923abaada5fc18fc01079e2d.tar.bz2
Turn on Num Lock by default only for official Chrome OS builds.
BUG=None (reported by http://groups.google.com/a/chromium.org/group/chromium-os-discuss/browse_thread/thread/925ef142c3fc2319#) TEST=None Review URL: http://codereview.chromium.org/8713010 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@111832 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r--chrome/browser/chromeos/chrome_browser_main_chromeos.cc9
1 files changed, 7 insertions, 2 deletions
diff --git a/chrome/browser/chromeos/chrome_browser_main_chromeos.cc b/chrome/browser/chromeos/chrome_browser_main_chromeos.cc
index f6976dc..b72519a 100644
--- a/chrome/browser/chromeos/chrome_browser_main_chromeos.cc
+++ b/chrome/browser/chromeos/chrome_browser_main_chromeos.cc
@@ -181,10 +181,15 @@ void ChromeBrowserMainPartsChromeos::PostMainMessageLoopStart() {
UpgradeDetectorChromeos::GetInstance()->Init();
if (chromeos::system::runtime_environment::IsRunningOnChromeOS()) {
- // For http://crosbug.com/p/5795 and http://crosbug.com/p/6245.
- // Enable Num Lock on X start up.
+ // Enable Num Lock on X start up for http://crosbug.com/p/5795 and
+ // http://crosbug.com/p/6245. We don't do this for Chromium OS since many
+ // netbooks do not work as intended when Num Lock is on (e.g. On a netbook
+ // with a small keyboard, u, i, o, p, ... keys might be repurposed as
+ // cursor keys when Num Lock is on).
+#if defined(GOOGLE_CHROME_BUILD)
chromeos::input_method::InputMethodManager::GetInstance()->
GetXKeyboard()->SetNumLockEnabled(true);
+#endif
#if defined(USE_AURA)
initial_browser_window_observer_.reset(