Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(43)

Unified Diff: ash/common/wm_shell.cc

Issue 2112403002: NOSUBMIT: Initialize a StatusAreaWidget inside ash wm (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | ash/mus/BUILD.gn » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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() {}
« no previous file with comments | « no previous file | ash/mus/BUILD.gn » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698