Chromium Code Reviews| Index: components/mus/mus_app.h |
| diff --git a/components/mus/mus_app.h b/components/mus/mus_app.h |
| index 64958ba9b91373fd8dfd31393549907f5ee2692e..621c08ce320a54d6cdc6ef377e8693c4ea3e1074 100644 |
| --- a/components/mus/mus_app.h |
| +++ b/components/mus/mus_app.h |
| @@ -12,6 +12,7 @@ |
| #include <vector> |
| #include "base/macros.h" |
| +#include "base/memory/weak_ptr.h" |
| #include "components/mus/public/interfaces/display.mojom.h" |
| #include "components/mus/public/interfaces/gpu.mojom.h" |
| #include "components/mus/public/interfaces/user_access_manager.mojom.h" |
| @@ -26,6 +27,7 @@ |
| #include "services/shell/public/cpp/interface_factory.h" |
| #include "services/shell/public/cpp/shell_client.h" |
| #include "services/tracing/public/cpp/tracing_impl.h" |
| +#include "ui/gfx/geometry/rect.h" |
|
sky
2016/05/03 02:39:50
forward declare rect.
rjkroege
2016/05/03 21:03:03
Done.
|
| #if defined(USE_OZONE) |
| #include "ui/ozone/public/client_native_pixmap_factory.h" |
| @@ -42,6 +44,7 @@ class PlatformEventSource; |
| namespace mus { |
| namespace ws { |
| class ForwardingWindowManager; |
| +class PlatformScreen; |
| class WindowServer; |
| } |
| @@ -117,6 +120,9 @@ class MandolineUIServicesApp |
| void Create(shell::Connection* connection, |
| mojom::GpuRequest request) override; |
| + // Callbacks for display configuration. |
| + void CreatePhysicalDisplayCallback(int64_t id, gfx::Rect bounds); |
|
sky
2016/05/03 02:39:50
const gfx::Rect&, document what id is, and name th
rjkroege
2016/05/03 21:03:03
Done.
|
| + |
| ws::PlatformDisplayInitParams platform_display_init_params_; |
| std::unique_ptr<ws::WindowServer> window_server_; |
| std::unique_ptr<ui::PlatformEventSource> event_source_; |
| @@ -131,6 +137,10 @@ class MandolineUIServicesApp |
| std::unique_ptr<ui::ClientNativePixmapFactory> client_native_pixmap_factory_; |
| #endif |
| + std::unique_ptr<ws::PlatformScreen> platform_screen_; |
| + |
| + base::WeakPtrFactory<MandolineUIServicesApp> weak_ptr_factory_; |
| + |
| DISALLOW_COPY_AND_ASSIGN(MandolineUIServicesApp); |
| }; |