Move functions for controlling Caps Lock to CapsLockDelegate from SystemTrayDelegate.

ash/system/tray_caps_lock.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 "ash/system/tray_caps_lock.h"
 
+#include "ash/caps_lock_delegate.h"
 #include "ash/shell.h"
-#include "ash/system/tray/system_tray_delegate.h"
 #include "ash/system/tray/tray_constants.h"
 #include "ash/system/tray/tray_views.h"
 #include "grit/ash_strings.h"
 #include "grit/ui_resources.h"
 #include "ui/base/accessibility/accessible_view_state.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/gfx/image/image.h"
 #include "ui/views/controls/image_view.h"
 #include "ui/views/controls/label.h"
 #include "ui/views/layout/box_layout.h"
@@ skipping 66 matching lines @@
                                    text_size.height()));
   }
 
   virtual void GetAccessibleState(ui::AccessibleViewState* state) OVERRIDE {
     state->role = ui::AccessibilityTypes::ROLE_PUSHBUTTON;
     state->name = text_label_->text();
   }
 
   // Overridden from ActionableView:
   virtual bool PerformAction(const ui::Event& event) OVERRIDE {
-    Shell::GetInstance()->tray_delegate()->SetCapsLockEnabled(
-        !Shell::GetInstance()->tray_delegate()->IsCapsLockOn());
+    Shell::GetInstance()->caps_lock_delegate()->ToggleCapsLock();
     return true;
   }
 
   views::Label* text_label_;
   views::Label* shortcut_label_;
 
   DISALLOW_COPY_AND_ASSIGN(CapsLockDefaultView);
 };
 
 TrayCapsLock::TrayCapsLock()
     : TrayImageItem(IDR_AURA_UBER_TRAY_CAPS_LOCK),
       default_(NULL),
       detailed_(NULL),
       search_mapped_to_caps_lock_(false),
       caps_lock_enabled_(
-          Shell::GetInstance()->tray_delegate()->IsCapsLockOn()),
+          Shell::GetInstance()->caps_lock_delegate()->IsCapsLockEnabled()),
       message_shown_(false) {
 }
 
 TrayCapsLock::~TrayCapsLock() {}
 
 bool TrayCapsLock::GetInitialVisibility() {
-  return Shell::GetInstance()->tray_delegate()->IsCapsLockOn();
+  return Shell::GetInstance()->caps_lock_delegate()->IsCapsLockEnabled();
 }
 
 views::View* TrayCapsLock::CreateDefaultView(user::LoginStatus status) {
   if (!caps_lock_enabled_)
     return NULL;
   DCHECK(default_ == NULL);
   default_ = new CapsLockDefaultView;
   default_->Update(caps_lock_enabled_, search_mapped_to_caps_lock_);
   return default_;
 }
@@ skipping 49 matching lines @@
         message_shown_ = true;
       }
     } else if (detailed_) {
       detailed_->GetWidget()->Close();
     }
   }
 }
 
 }  // namespace internal
 }  // namespace ash