Index: components/mus/example/client/client_application_delegate.h |
diff --git a/components/mus/example/client/client_application_delegate.h b/components/mus/example/client/client_application_delegate.h |
index 3a8f28d324b389ad917f77e2f20207a656376ae2..dc304ad1ef8eeea180f82001f91c1026503b8e37 100644 |
--- a/components/mus/example/client/client_application_delegate.h |
+++ b/components/mus/example/client/client_application_delegate.h |
@@ -7,35 +7,25 @@ |
#include "base/macros.h" |
#include "base/memory/scoped_ptr.h" |
-#include "components/mus/public/cpp/view_tree_delegate.h" |
#include "mojo/application/public/cpp/application_delegate.h" |
#include "mojo/application/public/cpp/interface_factory_impl.h" |
-namespace mandoline { |
-class AuraInit; |
-} |
+class MUSViewsInit; |
-class ClientApplicationDelegate : public mojo::ApplicationDelegate, |
- public mus::ViewTreeDelegate { |
+class ClientApplicationDelegate : public mojo::ApplicationDelegate { |
public: |
ClientApplicationDelegate(); |
~ClientApplicationDelegate() override; |
- // Overridden from ApplicationDelegate: |
- void Initialize(mojo::ApplicationImpl* app) override; |
- |
private: |
// ApplicationDelegate: |
+ void Initialize(mojo::ApplicationImpl* app) override; |
bool ConfigureIncomingConnection( |
mojo::ApplicationConnection* connection) override; |
- // mus::ViewTreeDelegate: |
- void OnEmbed(mus::View* root) override; |
- void OnConnectionLost(mus::ViewTreeConnection* connection) override; |
- |
mojo::ApplicationImpl* app_; |
- scoped_ptr<mandoline::AuraInit> aura_init_; |
+ scoped_ptr<MUSViewsInit> mus_views_init_; |
DISALLOW_COPY_AND_ASSIGN(ClientApplicationDelegate); |
}; |