Move functions for controlling Caps Lock to CapsLockDelegate from SystemTrayDelegate.

ash/shell.h

 // 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.
 
 #ifndef ASH_SHELL_H_
 #define ASH_SHELL_H_
 
 #include <utility>
 #include <vector>
 
@@ skipping 41 matching lines @@
 class Layer;
 }
 namespace views {
 class NonClientFrameView;
 class Widget;
 }
 
 namespace ash {
 
 class AcceleratorController;
+class CapsLockDelegate;
 class DesktopBackgroundController;
 class HighContrastController;
 class Launcher;
 class NestedDispatcherController;
 class PowerButtonController;
 class ScreenAsh;
 class ShellDelegate;
 class ShellObserver;
 class SystemTrayDelegate;
 class SystemTray;
@@ skipping 207 matching lines @@
     return display_controller_.get();
   }
   CursorManager* cursor_manager() { return &cursor_manager_; }
 
   ShellDelegate* delegate() { return delegate_.get(); }
 
   UserWallpaperDelegate* user_wallpaper_delegate() {
     return user_wallpaper_delegate_.get();
   }
 
+  CapsLockDelegate* caps_lock_delegate() {
+    return caps_lock_delegate_.get();
+  }
+
   HighContrastController* high_contrast_controller() {
     return high_contrast_controller_.get();
   }
 
   internal::MagnificationController* magnification_controller() {
     return magnification_controller_.get();
   }
 
   Launcher* launcher() { return launcher_.get(); }
 
@@ skipping 102 matching lines @@
   std::vector<WindowAndBoundsPair> to_restore_;
 
 #if !defined(OS_MACOSX)
   scoped_ptr<NestedDispatcherController> nested_dispatcher_controller_;
 
   scoped_ptr<AcceleratorController> accelerator_controller_;
 #endif  // !defined(OS_MACOSX)
 
   scoped_ptr<ShellDelegate> delegate_;
   scoped_ptr<UserWallpaperDelegate> user_wallpaper_delegate_;
+  scoped_ptr<CapsLockDelegate> caps_lock_delegate_;
 
   scoped_ptr<Launcher> launcher_;
 
   scoped_ptr<internal::AppListController> app_list_controller_;
 
   scoped_ptr<internal::ShellContextMenu> shell_context_menu_;
   scoped_ptr<internal::StackingController> stacking_controller_;
   scoped_ptr<internal::ActivationController> activation_controller_;
   scoped_ptr<internal::CaptureController> capture_controller_;
   scoped_ptr<internal::WindowModalityController> window_modality_controller_;
@@ skipping 62 matching lines @@
 
   // Used by ash/shell.
   content::BrowserContext* browser_context_;
 
   DISALLOW_COPY_AND_ASSIGN(Shell);
 };
 
 }  // namespace ash
 
 #endif  // ASH_SHELL_H_