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

Unified Diff: chrome/browser/ui/ash/caps_lock_handler.cc

Issue 10878058: Move functions for controlling Caps Lock to CapsLockDelegate from SystemTrayDelegate. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebase Created 8 years, 4 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
« no previous file with comments | « chrome/browser/ui/ash/caps_lock_handler.h ('k') | chrome/browser/ui/ash/caps_lock_handler_browsertest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/ui/ash/caps_lock_handler.cc
diff --git a/chrome/browser/ui/ash/caps_lock_handler.cc b/chrome/browser/ui/ash/caps_lock_handler.cc
index 8da9ad4ed6ce3325a855ad6815232233c29c1517..a4c81b4d359dc6e4eeb5ebaca6b171a4ee500b73 100644
--- a/chrome/browser/ui/ash/caps_lock_handler.cc
+++ b/chrome/browser/ui/ash/caps_lock_handler.cc
@@ -37,17 +37,37 @@ CapsLockHandler::~CapsLockHandler() {
#endif
}
-bool CapsLockHandler::HandleToggleCapsLock() {
+bool CapsLockHandler::IsCapsLockEnabled() const {
+#if defined(OS_CHROMEOS)
+ return caps_lock_is_on_;
+#else
+ NOTIMPLEMENTED();
+ return false;
+#endif
+}
+
+void CapsLockHandler::SetCapsLockEnabled(bool enabled) {
+#if defined(OS_CHROMEOS)
+ DCHECK(content::BrowserThread::CurrentlyOn(content::BrowserThread::UI));
+ if (is_running_on_chromeos_) {
+ xkeyboard_->SetCapsLockEnabled(enabled);
+ return;
+ }
+#else
+ NOTIMPLEMENTED();
+#endif
+}
+
+void CapsLockHandler::ToggleCapsLock() {
#if defined(OS_CHROMEOS)
DCHECK(content::BrowserThread::CurrentlyOn(content::BrowserThread::UI));
if (is_running_on_chromeos_) {
xkeyboard_->SetCapsLockEnabled(!caps_lock_is_on_);
- return true; // consume the shortcut key.
+ return;
}
#else
NOTIMPLEMENTED();
#endif
- return false;
}
#if defined(OS_CHROMEOS)
« no previous file with comments | « chrome/browser/ui/ash/caps_lock_handler.h ('k') | chrome/browser/ui/ash/caps_lock_handler_browsertest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698