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

Unified Diff: mash/quick_launch/quick_launch.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: mash/quick_launch/quick_launch.cc
diff --git a/mash/quick_launch/quick_launch.cc b/mash/quick_launch/quick_launch.cc
index a9f51a0f68099f91fe6726a8eb874f8a2c8c5c00..a8ca6da4d5985ca693d37c1a5f61174ce4d0f92d 100644
--- a/mash/quick_launch/quick_launch.cc
+++ b/mash/quick_launch/quick_launch.cc
@@ -171,14 +171,14 @@ void QuickLaunch::RemoveWindow(views::Widget* window) {
}
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);
+ aura_init_ = base::MakeUnique<views::AuraInit>();
// 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()) {
+ if (!aura_init_->Init(context()->connector(), context()->identity(),
+ "views_mus_resources.pak", std::string(), nullptr,
+ views::AuraInit::Mode::AURA_MUS)) {
context()->QuitNow();
return;
}

Powered by Google App Engine
This is Rietveld 408576698