| Index: ash/shell.cc
|
| diff --git a/ash/shell.cc b/ash/shell.cc
|
| index c6eb4d3773eaa1c164691ccd596b751986f9b65e..d4baf4e5fe47055c4f486a21adb303a345daee61 100644
|
| --- a/ash/shell.cc
|
| +++ b/ash/shell.cc
|
| @@ -9,6 +9,7 @@
|
|
|
| #include "ash/accelerators/focus_manager_factory.h"
|
| #include "ash/ash_switches.h"
|
| +#include "ash/caps_lock_delegate_stub.h"
|
| #include "ash/desktop_background/desktop_background_controller.h"
|
| #include "ash/desktop_background/desktop_background_resources.h"
|
| #include "ash/desktop_background/desktop_background_view.h"
|
| @@ -17,6 +18,7 @@
|
| #include "ash/high_contrast/high_contrast_controller.h"
|
| #include "ash/launcher/launcher.h"
|
| #include "ash/magnifier/magnification_controller.h"
|
| +#include "ash/caps_lock_delegate.h"
|
| #include "ash/display/display_controller.h"
|
| #include "ash/display/mouse_cursor_event_filter.h"
|
| #include "ash/display/multi_display_manager.h"
|
| @@ -452,6 +454,12 @@ void Shell::Init() {
|
|
|
| InitRootWindowController(root_window_controller);
|
|
|
| + // StatusAreaWidget uses Shell's CapsLockDelegate.
|
| + if (delegate_.get())
|
| + caps_lock_delegate_.reset(delegate_->CreateCapsLockDelegate());
|
| + else
|
| + caps_lock_delegate_.reset(new CapsLockDelegateStub);
|
| +
|
| // Initialize Primary RootWindow specific items.
|
| status_area_widget_ = new internal::StatusAreaWidget();
|
| status_area_widget_->CreateTrayViews(delegate_.get());
|
|
|