| Index: ui/views/mus/aura_init.h
|
| diff --git a/ui/views/mus/aura_init.h b/ui/views/mus/aura_init.h
|
| index fc37b5b691f8e64622edcfba22ac38c127550b90..15deb095dd9f39226a8f813ce64677af6fc92e90 100644
|
| --- a/ui/views/mus/aura_init.h
|
| +++ b/ui/views/mus/aura_init.h
|
| @@ -65,8 +65,13 @@ class VIEWS_MUS_EXPORT AuraInit {
|
| // Only valid if Mode::AURA_MUS was passed to constructor.
|
| MusClient* mus_client() { return mus_client_.get(); }
|
|
|
| + // Returns true if AuraInit was able to successfully complete initialization.
|
| + // If this returns false, then Aura is in an unusable state, and calling
|
| + // services should shutdown.
|
| + bool initialized() { return initialized_; }
|
| +
|
| private:
|
| - void InitializeResources(service_manager::Connector* connector);
|
| + bool InitializeResources(service_manager::Connector* connector);
|
|
|
| #if defined(OS_LINUX)
|
| sk_sp<font_service::FontLoader> font_loader_;
|
| @@ -79,6 +84,9 @@ class VIEWS_MUS_EXPORT AuraInit {
|
| std::unique_ptr<MusClient> mus_client_;
|
| std::unique_ptr<ViewsDelegate> views_delegate_;
|
|
|
| + // Whether or not initialization succeeds.
|
| + bool initialized_ = false;
|
| +
|
| DISALLOW_COPY_AND_ASSIGN(AuraInit);
|
| };
|
|
|
|
|