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

Unified Diff: ash/mus/window_manager_application.cc

Issue 2116153002: Initialize DBus in mojo:ash on chrome os (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 | « ash/mus/BUILD.gn ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/mus/window_manager_application.cc
diff --git a/ash/mus/window_manager_application.cc b/ash/mus/window_manager_application.cc
index f8b18788b7cc885ff0e29e6649ef433b924f6c42..de4bf1290e5ff036c8bde4093631e7cc571c965b 100644
--- a/ash/mus/window_manager_application.cc
+++ b/ash/mus/window_manager_application.cc
@@ -23,11 +23,19 @@
#include "ui/events/event.h"
#include "ui/views/mus/aura_init.h"
+#if defined(OS_CHROMEOS)
+#include "chromeos/dbus/dbus_thread_manager.h"
+#endif
+
namespace ash {
namespace mus {
WindowManagerApplication::WindowManagerApplication()
- : connector_(nullptr), screenlock_state_listener_binding_(this) {}
+ : connector_(nullptr), screenlock_state_listener_binding_(this) {
+#if defined(OS_CHROMEOS)
+ chromeos::DBusThreadManager::Initialize();
James Cook 2016/07/01 23:17:36 I put this here instead of in WMA::Initialize() be
+#endif
+}
WindowManagerApplication::~WindowManagerApplication() {
// AcceleratorRegistrarImpl removes an observer in its destructor. Destroy
@@ -40,6 +48,10 @@ WindowManagerApplication::~WindowManagerApplication() {
// Destroy the WindowManager while still valid. This way we ensure
// OnWillDestroyRootWindowController() is called (if it hasn't been already).
window_manager_.reset();
+
+#if defined(OS_CHROMEOS)
+ chromeos::DBusThreadManager::Shutdown();
+#endif
}
void WindowManagerApplication::OnAcceleratorRegistrarDestroyed(
« no previous file with comments | « ash/mus/BUILD.gn ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698