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

Unified Diff: ash/mus/window_manager_application.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 | « ash/mus/root_window_controller.cc ('k') | ash/system/status_area_widget.cc » ('j') | 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..e454f3c54da7a7a86f2a3b4f5ce6119e5db2a6a9 100644
--- a/ash/mus/window_manager_application.cc
+++ b/ash/mus/window_manager_application.cc
@@ -6,6 +6,7 @@
#include <utility>
+#include "ash/common/material_design/material_design_controller.h"//JAMES
#include "ash/mus/accelerator_registrar_impl.h"
#include "ash/mus/root_window_controller.h"
#include "ash/mus/shelf_layout_impl.h"
@@ -23,6 +24,14 @@
#include "ui/events/event.h"
#include "ui/views/mus/aura_init.h"
+//JAMES
+#include "ui/message_center/message_center.h"
+#if defined(OS_CHROMEOS)
+#include "chromeos/audio/cras_audio_handler.h"
+#include "chromeos/dbus/dbus_thread_manager.h"
+#include "device/bluetooth/dbus/bluez_dbus_manager.h"
+#endif
+
namespace ash {
namespace mus {
@@ -61,6 +70,7 @@ void WindowManagerApplication::Initialize(shell::Connector* connector,
window_manager_.reset(new WindowManager(connector_));
aura_init_.reset(new views::AuraInit(connector_, "ash_mus_resources.pak"));
+ MaterialDesignController::Initialize();//JAMES
tracing_.Initialize(connector, identity.name());
@@ -68,6 +78,17 @@ void WindowManagerApplication::Initialize(shell::Connector* connector,
window_manager_.get(), window_manager_.get(), nullptr);
window_tree_client->ConnectAsWindowManager(connector);
+ //JAMES from sysui_application.cc InitializeComponents.
+ message_center::MessageCenter::Initialize();
+#if defined(OS_CHROMEOS)
+ chromeos::DBusThreadManager::Initialize();
+ bluez::BluezDBusManager::Initialize(
+ chromeos::DBusThreadManager::Get()->GetSystemBus(),
+ chromeos::DBusThreadManager::Get()->IsUsingStub(
+ chromeos::DBusClientBundle::BLUETOOTH));
+ chromeos::CrasAudioHandler::InitializeForTesting();
+#endif
+
InitWindowManager(window_tree_client);
}
« no previous file with comments | « ash/mus/root_window_controller.cc ('k') | ash/system/status_area_widget.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698