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

Unified Diff: mash/quick_launch/quick_launch.cc

Issue 2973103002: Revert of 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
« no previous file with comments | « mash/example/window_type_launcher/window_type_launcher.cc ('k') | mash/simple_wm/simple_wm.cc » ('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 1a5dafac72e0ff323e841197550286b65355222b..a9f51a0f68099f91fe6726a8eb874f8a2c8c5c00 100644
--- a/mash/quick_launch/quick_launch.cc
+++ b/mash/quick_launch/quick_launch.cc
@@ -171,13 +171,14 @@
}
void QuickLaunch::OnStart() {
+ aura_init_ = base::MakeUnique<views::AuraInit>(
+ 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.
- aura_init_ = views::AuraInit::Create(
- context()->connector(), context()->identity(), "views_mus_resources.pak",
- std::string(), nullptr, views::AuraInit::Mode::AURA_MUS);
- if (!aura_init_) {
+ if (!aura_init_->initialized()) {
context()->QuitNow();
return;
}
« no previous file with comments | « mash/example/window_type_launcher/window_type_launcher.cc ('k') | mash/simple_wm/simple_wm.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698