Move functions for controlling Caps Lock to CapsLockDelegate from SystemTrayDelegate.

chrome/browser/ui/ash/caps_lock_handler.cc

 // 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/ash/caps_lock_handler.h"
 
 #include "base/logging.h"
 #include "content/public/browser/browser_thread.h"
 
 // TODO(yusukes): Support Ash on Windows.
@@ skipping 19 matching lines @@
 
 CapsLockHandler::~CapsLockHandler() {
 #if defined(OS_CHROMEOS)
   chromeos::SystemKeyEventListener* system_event_listener =
       chromeos::SystemKeyEventListener::GetInstance();
   if (system_event_listener)
     system_event_listener->RemoveCapsLockObserver(this);
 #endif
 }
 
-bool CapsLockHandler::HandleToggleCapsLock() {
+bool CapsLockHandler::IsCapsLockEnabled() {
 #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 xkeyboard_->CapsLockIsEnabled();

[Daniel Erat, 2012/08/26 22:32:47]

should you just be returning caps_lock_is_on_ here?

[mazda, 2012/08/27 16:06:40]

It seems better. Thanks.

   }
 #else
   NOTIMPLEMENTED();
 #endif
   return false;
 }
 
+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;
+  }
+#else
+  NOTIMPLEMENTED();
+#endif
+}
+
 #if defined(OS_CHROMEOS)
 void CapsLockHandler::OnCapsLockChange(bool enabled) {
   caps_lock_is_on_ = enabled;
 }
 #endif