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

Unified Diff: mash/quick_launch/quick_launch.cc

Issue 2949103002: Fix QuickLaunch AuraInit Crash (Closed)
Patch Set: Todo Created 3 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 | ui/views/mus/aura_init.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: mash/quick_launch/quick_launch.cc
diff --git a/mash/quick_launch/quick_launch.cc b/mash/quick_launch/quick_launch.cc
index 9948a8954a4f1f6e489bb451c81357a0810ee32a..a9f51a0f68099f91fe6726a8eb874f8a2c8c5c00 100644
--- a/mash/quick_launch/quick_launch.cc
+++ b/mash/quick_launch/quick_launch.cc
@@ -175,6 +175,14 @@ void QuickLaunch::OnStart() {
context()->connector(), context()->identity(), "views_mus_resources.pak",
std::string(), nullptr, views::AuraInit::Mode::AURA_MUS);
+ // If AuraInit was unable to initialize there is no longer a peer connection.
+ // The ServiceManager is in the process of shutting down, however we haven't
+ // been notified yet. Close our ServiceContext and shutdown.
+ if (!aura_init_->initialized()) {
+ context()->QuitNow();
+ return;
+ }
+
Launch(mojom::kWindow, mojom::LaunchMode::MAKE_NEW);
}
« no previous file with comments | « no previous file | ui/views/mus/aura_init.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698