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

Unified Diff: mash/catalog_viewer/catalog_viewer.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/catalog_viewer/catalog_viewer.cc
diff --git a/mash/catalog_viewer/catalog_viewer.cc b/mash/catalog_viewer/catalog_viewer.cc
index c3ca39940eb9ee38c89d7910d65283f520e8e20c..861c4253be1528b04272b77d7afc6c3fcbf16d78 100644
--- a/mash/catalog_viewer/catalog_viewer.cc
+++ b/mash/catalog_viewer/catalog_viewer.cc
@@ -222,9 +222,12 @@ void CatalogViewer::RemoveWindow(views::Widget* window) {
}
void CatalogViewer::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 (!aura_init_->Init(context()->connector(), context()->identity(),
+ "views_mus_resources.pak", std::string(), nullptr,
+ views::AuraInit::Mode::AURA_MUS)) {
+ context()->QuitNow();
+ }
}
void CatalogViewer::OnBindInterface(

Powered by Google App Engine
This is Rietveld 408576698