| Index: mash/example/common/mus_views_init.h
|
| diff --git a/mash/example/common/mus_views_init.h b/mash/example/common/mus_views_init.h
|
| deleted file mode 100644
|
| index 0e5cb74f812fa0c4d75a11fff6140690e9af4134..0000000000000000000000000000000000000000
|
| --- a/mash/example/common/mus_views_init.h
|
| +++ /dev/null
|
| @@ -1,55 +0,0 @@
|
| -// Copyright 2015 The Chromium Authors. All rights reserved.
|
| -// Use of this source code is governed by a BSD-style license that can be
|
| -// found in the LICENSE file.
|
| -
|
| -#ifndef MASH_EXAMPLE_COMMON_MUS_VIEWS_INIT_H_
|
| -#define MASH_EXAMPLE_COMMON_MUS_VIEWS_INIT_H_
|
| -
|
| -#include <memory>
|
| -
|
| -#include "base/macros.h"
|
| -#include "services/ui/public/cpp/window_tree_client_delegate.h"
|
| -#include "services/ui/public/interfaces/window_manager.mojom.h"
|
| -#include "ui/views/mus/aura_init.h"
|
| -#include "ui/views/views_delegate.h"
|
| -
|
| -namespace service_manager {
|
| -class ServiceContext;
|
| -}
|
| -
|
| -namespace views {
|
| -class AuraInit;
|
| -}
|
| -
|
| -// Does the necessary setup to use mus, views and the example wm.
|
| -class MUSViewsInit : public views::ViewsDelegate,
|
| - public ui::WindowTreeClientDelegate {
|
| - public:
|
| - explicit MUSViewsInit(service_manager::ServiceContext* app);
|
| - ~MUSViewsInit() override;
|
| -
|
| - private:
|
| - ui::Window* NewWindow();
|
| -
|
| - // views::ViewsDelegate:
|
| - views::NativeWidget* CreateNativeWidget(
|
| - views::internal::NativeWidgetDelegate* delegate) override;
|
| - void OnBeforeWidgetInit(
|
| - views::Widget::InitParams* params,
|
| - views::internal::NativeWidgetDelegate* delegate) override;
|
| -
|
| - // ui::WindowTreeClientDelegate:
|
| - void OnEmbed(ui::Window* root) override;
|
| - void OnDidDestroyClient(ui::WindowTreeClient* client) override;
|
| -#if defined(OS_WIN)
|
| - HICON GetSmallWindowIcon() const override;
|
| -#endif
|
| -
|
| - service_manager::ServiceContext* app_;
|
| - std::unique_ptr<views::AuraInit> aura_init_;
|
| - ui::mojom::WindowManagerPtr window_manager_;
|
| -
|
| - DISALLOW_COPY_AND_ASSIGN(MUSViewsInit);
|
| -};
|
| -
|
| -#endif // MASH_EXAMPLE_COMMON_MUS_VIEWS_INIT_H_
|
|
|