Basic display management for mus

components/mus/mus_app.h

 // Copyright 2014 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 COMPONENTS_MUS_MUS_APP_H_
 #define COMPONENTS_MUS_MUS_APP_H_
 
 #include <stdint.h>
 
 #include <memory>
 #include <string>
 #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"
 #include "components/mus/public/interfaces/window_manager_factory.mojom.h"
 #include "components/mus/public/interfaces/window_server_test.mojom.h"
 #include "components/mus/public/interfaces/window_tree.mojom.h"
 #include "components/mus/public/interfaces/window_tree_host.mojom.h"
 #include "components/mus/ws/platform_display_init_params.h"
 #include "components/mus/ws/user_id.h"
 #include "components/mus/ws/window_server_delegate.h"
 #include "services/shell/public/cpp/application_runner.h"
 #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"
 #endif
 
 namespace shell {
 class Connector;
 }
 
 namespace ui {
 class PlatformEventSource;
 }
 
 namespace mus {
 namespace ws {
 class ForwardingWindowManager;
+class PlatformScreen;
 class WindowServer;
 }
 
 class MandolineUIServicesApp
     : public shell::ShellClient,
       public ws::WindowServerDelegate,
       public shell::InterfaceFactory<mojom::DisplayManager>,
       public shell::InterfaceFactory<mojom::UserAccessManager>,
       public shell::InterfaceFactory<mojom::WindowManagerFactoryService>,
       public shell::InterfaceFactory<mojom::WindowTreeFactory>,
@@ skipping 55 matching lines @@
               mojom::WindowTreeHostFactoryRequest request) override;
 
   // shell::InterfaceFactory<mojom::WindowServerTest> implementation.
   void Create(shell::Connection* connection,
               mojom::WindowServerTestRequest request) override;
 
   // shell::InterfaceFactory<mojom::Gpu> implementation.
   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 this OnCreatedPhysicalDisplay.

[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_;
   mojo::TracingImpl tracing_;
   using PendingRequests = std::vector<std::unique_ptr<PendingRequest>>;
   PendingRequests pending_requests_;
 
   UserIdToUserState user_id_to_user_state_;
 
   bool test_config_;
 #if defined(USE_OZONE)
   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);
 };
 
 }  // namespace mus
 
 #endif  // COMPONENTS_MUS_MUS_APP_H_