| Index: components/mus/example/window_type_launcher/window_type_launcher.h
|
| diff --git a/components/mus/example/client/client_application_delegate.h b/components/mus/example/window_type_launcher/window_type_launcher.h
|
| similarity index 59%
|
| copy from components/mus/example/client/client_application_delegate.h
|
| copy to components/mus/example/window_type_launcher/window_type_launcher.h
|
| index 3a8f28d324b389ad917f77e2f20207a656376ae2..f3136f3d065e4bb2fe91f42e0907fc97c3ea8346 100644
|
| --- a/components/mus/example/client/client_application_delegate.h
|
| +++ b/components/mus/example/window_type_launcher/window_type_launcher.h
|
| @@ -2,8 +2,8 @@
|
| // Use of this source code is governed by a BSD-style license that can be
|
| // found in the LICENSE file.
|
|
|
| -#ifndef COMPONENTS_MUS_EXAMPLE_CLIENT_CLIENT_APPLICATION_DELEGATE_H_
|
| -#define COMPONENTS_MUS_EXAMPLE_CLIENT_CLIENT_APPLICATION_DELEGATE_H_
|
| +#ifndef COMPONENTS_MUS_EXAMPLE_WINDOW_TYPE_LAUNCHER_WINDOW_TYPE_LAUNCHER_H_
|
| +#define COMPONENTS_MUS_EXAMPLE_WINDOW_TYPE_LAUNCHER_WINDOW_TYPE_LAUNCHER_H_
|
|
|
| #include "base/macros.h"
|
| #include "base/memory/scoped_ptr.h"
|
| @@ -12,22 +12,22 @@
|
| #include "mojo/application/public/cpp/interface_factory_impl.h"
|
|
|
| namespace mandoline {
|
| -class AuraInit;
|
| + class AuraInit;
|
| }
|
|
|
| -class ClientApplicationDelegate : public mojo::ApplicationDelegate,
|
| - public mus::ViewTreeDelegate {
|
| - public:
|
| - ClientApplicationDelegate();
|
| - ~ClientApplicationDelegate() override;
|
| +class WindowTypeLauncher : public mojo::ApplicationDelegate,
|
| + public mus::ViewTreeDelegate {
|
| +public:
|
| + WindowTypeLauncher();
|
| + ~WindowTypeLauncher() override;
|
|
|
| // Overridden from ApplicationDelegate:
|
| void Initialize(mojo::ApplicationImpl* app) override;
|
|
|
| - private:
|
| +private:
|
| // ApplicationDelegate:
|
| bool ConfigureIncomingConnection(
|
| - mojo::ApplicationConnection* connection) override;
|
| + mojo::ApplicationConnection* connection) override;
|
|
|
| // mus::ViewTreeDelegate:
|
| void OnEmbed(mus::View* root) override;
|
| @@ -37,7 +37,7 @@ class ClientApplicationDelegate : public mojo::ApplicationDelegate,
|
|
|
| scoped_ptr<mandoline::AuraInit> aura_init_;
|
|
|
| - DISALLOW_COPY_AND_ASSIGN(ClientApplicationDelegate);
|
| + DISALLOW_COPY_AND_ASSIGN(WindowTypeLauncher);
|
| };
|
|
|
| -#endif // COMPONENTS_MUS_EXAMPLE_CLIENT_CLIENT_APPLICATION_DELEGATE_H_
|
| +#endif // COMPONENTS_MUS_EXAMPLE_WINDOW_TYPE_LAUNCHER_WINDOW_TYPE_LAUNCHER_H_
|
|
|