| Index: ash/common/wm_shell.cc
|
| diff --git a/ash/common/wm_shell.cc b/ash/common/wm_shell.cc
|
| index 5d607d60ebc7507ac1f777c2ceeb83c592e23d27..74c89967895b3099e533293b791ab71f49f0e94f 100644
|
| --- a/ash/common/wm_shell.cc
|
| +++ b/ash/common/wm_shell.cc
|
| @@ -16,6 +16,10 @@
|
| #include "base/bind.h"
|
| #include "base/logging.h"
|
|
|
| +#if defined(OS_CHROMEOS)
|
| +#include "ash/common/system/chromeos/power/power_status.h"
|
| +#endif
|
| +
|
| namespace ash {
|
|
|
| // static
|
| @@ -47,7 +51,14 @@ void WmShell::RemoveShellObserver(ShellObserver* observer) {
|
| WmShell::WmShell()
|
| : focus_cycler_(new FocusCycler),
|
| system_tray_notifier_(new SystemTrayNotifier),
|
| - window_selector_controller_(new WindowSelectorController()) {}
|
| + window_selector_controller_(new WindowSelectorController()) {
|
| +#if defined(OS_CHROMEOS)
|
| + //JAMES move this to WindowManagerApplication and sort out the protocol
|
| + //buffer version problems.
|
| + if (!PowerStatus::IsInitialized())
|
| + PowerStatus::Initialize();
|
| +#endif
|
| +}
|
|
|
| WmShell::~WmShell() {}
|
|
|
|
|