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

Unified Diff: ash/mus/window_manager_application.cc

Issue 2967943002: Update AuraInit to handle failed initialization (Closed)
Patch Set: Created 3 years, 5 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
Index: ash/mus/window_manager_application.cc
diff --git a/ash/mus/window_manager_application.cc b/ash/mus/window_manager_application.cc
index 274c231ecc303988d8c33710f919f87b33c3467a..b6c53783e7d88ae7b92fb00235657943f47de2d2 100644
--- a/ash/mus/window_manager_application.cc
+++ b/ash/mus/window_manager_application.cc
@@ -129,10 +129,14 @@ void WindowManagerApplication::OnStart() {
mojo_interface_factory::RegisterInterfaces(
&registry_, base::ThreadTaskRunnerHandle::Get());
- aura_init_ = base::MakeUnique<views::AuraInit>(
- context()->connector(), context()->identity(), "ash_mus_resources.pak",
- "ash_mus_resources_200.pak", nullptr,
- views::AuraInit::Mode::AURA_MUS_WINDOW_MANAGER);
+ aura_init_ = base::MakeUnique<views::AuraInit>();
+ if (!aura_init_->Init(context()->connector(), context()->identity(),
+ "ash_mus_resources.pak", "ash_mus_resources_200.pak",
+ nullptr,
+ views::AuraInit::Mode::AURA_MUS_WINDOW_MANAGER)) {
+ context()->QuitNow();
+ return;
+ }
window_manager_ = base::MakeUnique<WindowManager>(
context()->connector(), ash_config_, show_primary_host_on_connect_);

Powered by Google App Engine
This is Rietveld 408576698