| Index: ui/views/mus/platform_window_mus.h
|
| diff --git a/ui/views/mus/platform_window_mus.h b/ui/views/mus/platform_window_mus.h
|
| index fadd64ff5d50d7e94e21c29fa301c3a760cbb8ea..ee124f5f6b2c4a9828a60cb0b1098a0bbf0b561c 100644
|
| --- a/ui/views/mus/platform_window_mus.h
|
| +++ b/ui/views/mus/platform_window_mus.h
|
| @@ -16,6 +16,18 @@
|
| #include "ui/platform_window/platform_window.h"
|
| #include "ui/views/mus/mus_export.h"
|
|
|
| +namespace bitmap_uploader {
|
| +class BitmapUploader;
|
| +}
|
| +
|
| +namespace mojo {
|
| +class Shell;
|
| +}
|
| +
|
| +namespace ui {
|
| +class ViewProp;
|
| +}
|
| +
|
| namespace views {
|
|
|
| class VIEWS_MUS_EXPORT PlatformWindowMus
|
| @@ -24,6 +36,7 @@ class VIEWS_MUS_EXPORT PlatformWindowMus
|
| public NON_EXPORTED_BASE(mus::InputEventHandler) {
|
| public:
|
| PlatformWindowMus(ui::PlatformWindowDelegate* delegate,
|
| + mojo::Shell* shell,
|
| mus::Window* mus_window);
|
| ~PlatformWindowMus() override;
|
|
|
| @@ -82,6 +95,8 @@ class VIEWS_MUS_EXPORT PlatformWindowMus
|
| // True if OnWindowDestroyed() has been received.
|
| bool mus_window_destroyed_;
|
|
|
| + scoped_ptr<bitmap_uploader::BitmapUploader> bitmap_uploader_;
|
| + scoped_ptr<ui::ViewProp> prop_;
|
| #ifndef NDEBUG
|
| scoped_ptr<base::WeakPtrFactory<PlatformWindowMus>> weak_factory_;
|
| #endif
|
|
|