Connect mojom::DisplayController from ash to ui.

services/ui/display/platform_screen_ozone.h

 // Copyright 2016 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 SERVICES_UI_DISPLAY_PLATFORM_SCREEN_OZONE_H_
 #define SERVICES_UI_DISPLAY_PLATFORM_SCREEN_OZONE_H_
 
 #include <stdint.h>
 
 #include <set>
 #include <vector>
 
 #include "base/callback.h"
 #include "base/macros.h"
+#include "mojo/public/cpp/bindings/binding_set.h"
+#include "services/shell/public/cpp/connection.h"
+#include "services/shell/public/cpp/interface_factory.h"
 #include "services/ui/display/platform_screen.h"
 #include "services/ui/public/interfaces/display/display_controller.mojom.h"
 #include "ui/display/chromeos/display_configurator.h"
 #include "ui/display/display.h"
 
 namespace display {
 
 // PlatformScreenOzone provides the necessary functionality to configure all
 // attached physical displays on the ozone platform.
-class PlatformScreenOzone : public PlatformScreen,
-                            public ui::DisplayConfigurator::Observer,
-                            public mojom::DisplayController {
+class PlatformScreenOzone
+    : public PlatformScreen,
+      public ui::DisplayConfigurator::Observer,
+      public shell::InterfaceFactory<mojom::DisplayController>,
+      public mojom::DisplayController {
  public:
   PlatformScreenOzone();
   ~PlatformScreenOzone() override;
 
   // PlatformScreen:
+  void AddInterfaces(shell::InterfaceRegistry* registry) override;
   void Init(PlatformScreenDelegate* delegate) override;
   int64_t GetPrimaryDisplayId() const override;
 
   // mojom::DisplayController:
-  void ToggleVirtualDisplay(
-      const ToggleVirtualDisplayCallback& callback) override;
+  void ToggleVirtualDisplay() override;
 
  private:
   // TODO(kylechar): This struct is just temporary until we migrate
   // DisplayManager code out of ash so it can be used here.
   struct DisplayInfo {
     DisplayInfo(int64_t new_id, const gfx::Rect& new_bounds)
         : id(new_id), bounds(new_bounds) {}
 
     int64_t id;
     // The display bounds.
@@ skipping 35 matching lines @@
   // iterator if there is no display with that id.
   CachedDisplayIterator GetCachedDisplayIterator(int64_t display_id);
 
   // ui::DisplayConfigurator::Observer:
   void OnDisplayModeChanged(
       const ui::DisplayConfigurator::DisplayStateList& displays) override;
   void OnDisplayModeChangeFailed(
       const ui::DisplayConfigurator::DisplayStateList& displays,
       ui::MultipleDisplayState failed_new_state) override;
 
+  // mojo::InterfaceFactory<mojom::DisplayController>:
+  void Create(const shell::Identity& remote_identity,
+              mojom::DisplayControllerRequest request) override;
+
+  ui::DisplayConfigurator display_configurator_;
   PlatformScreenDelegate* delegate_ = nullptr;
-  ui::DisplayConfigurator display_configurator_;
 
   // TODO(kylechar): These values can/should be replaced by DisplayLayout.
   int64_t primary_display_id_ = display::Display::kInvalidDisplayID;
   std::vector<DisplayInfo> cached_displays_;
   gfx::Point next_display_origin_;
 
+  mojo::BindingSet<mojom::DisplayController> bindings_;
+
   DISALLOW_COPY_AND_ASSIGN(PlatformScreenOzone);
 };
 
 }  // namespace display
 
 #endif  // SERVICES_UI_DISPLAY_PLATFORM_SCREEN_OZONE_H_