Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1147)

Unified Diff: chrome/browser/ui/views/aura/caps_lock_handler.cc

Issue 9225004: Handle Caps Lock short cut (Shift+Search) in ash [part 2 of 2]. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebase Created 8 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: chrome/browser/ui/views/aura/caps_lock_handler.cc
diff --git a/chrome/browser/ui/views/aura/caps_lock_handler.cc b/chrome/browser/ui/views/aura/caps_lock_handler.cc
new file mode 100644
index 0000000000000000000000000000000000000000..84c0f904ecb1e0b729d161e2d0c9c5f572924e92
--- /dev/null
+++ b/chrome/browser/ui/views/aura/caps_lock_handler.cc
@@ -0,0 +1,67 @@
+// 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/views/aura/caps_lock_handler.h"
+
+#include "content/public/browser/browser_thread.h"
+
+// TODO(yusukes): Support ash on Windows.
+#if defined(OS_CHROMEOS)
+#include "chrome/browser/chromeos/input_method/input_method_manager.h"
+#include "chrome/browser/chromeos/input_method/xkeyboard.h"
+#include "chrome/browser/chromeos/system/runtime_environment.h"
+#endif
+
+CapsLockHandler::CapsLockHandler()
+ :
+#if defined(OS_CHROMEOS)
+ is_running_on_chromeos_(
Daniel Erat 2012/01/18 15:44:31 nit: the lines in the initializer list should be i
Yusuke Sato 2012/01/23 06:53:49 Done.
+ chromeos::system::runtime_environment::IsRunningOnChromeOS()),
+ caps_lock_is_on_(chromeos::input_method::XKeyboard::CapsLockIsEnabled())
+#else
+ is_running_on_chromeos_(false),
+ caps_lock_is_on_(false)
+#endif
+{
+#if defined(OS_CHROMEOS)
+ chromeos::SystemKeyEventListener* system_event_listener
+ = chromeos::SystemKeyEventListener::GetInstance();
Daniel Erat 2012/01/18 15:44:31 nit: equals sign should be at end of previous line
Yusuke Sato 2012/01/23 06:53:49 Done.
+ // SystemKeyEventListener is instantiated only when running on Chrome OS.
Daniel Erat 2012/01/18 15:44:31 this comment doesn't exactly match the check. sho
Yusuke Sato 2012/01/23 06:53:49 Done.
+ DCHECK((!is_running_on_chromeos_) || system_event_listener);
Daniel Erat 2012/01/18 15:44:31 nit: remove extra parentheses around !is_running_o
Yusuke Sato 2012/01/23 06:53:49 Done.
+ if (system_event_listener)
+ system_event_listener->AddCapsLockObserver(this);
+#endif
+}
+
+CapsLockHandler::~CapsLockHandler() {
+#if defined(OS_CHROMEOS)
+ chromeos::SystemKeyEventListener* system_event_listener
+ = chromeos::SystemKeyEventListener::GetInstance();
Daniel Erat 2012/01/18 15:44:31 nit: move equals sign to previous line
Yusuke Sato 2012/01/23 06:53:49 Done.
+ if (system_event_listener)
+ system_event_listener->RemoveCapsLockObserver(this);
+#endif
+}
+
+bool CapsLockHandler::HandleToggleCapsLock() {
+#if defined(OS_CHROMEOS)
+ DCHECK(content::BrowserThread::CurrentlyOn(content::BrowserThread::UI));
+ if (is_running_on_chromeos_) {
+ // TODO(yusukes): Do not change Caps Lock status and just return false if
+ // spoken feedback is enabled (crosbug.com/110127).
+ chromeos::input_method::InputMethodManager* input_method_manager =
+ chromeos::input_method::InputMethodManager::GetInstance();
+ input_method_manager->GetXKeyboard()->SetCapsLockEnabled(!caps_lock_is_on_);
+ return true; // consume the short cut key.
+ }
+#else
+ NOTIMPLEMENTED();
+#endif
+ return false;
+}
+
+#if defined(OS_CHROMEOS)
+void CapsLockHandler::OnCapsLockChange(bool enabled) {
+ caps_lock_is_on_ = enabled;
+}
+#endif

Powered by Google App Engine
This is Rietveld 408576698