[WIP] Make content_shell run under Wayland

ui/ozone/platform/wayland/wayland_output.h

Index: ui/ozone/platform/wayland/wayland_output.h
diff --git a/ui/ozone/platform/wayland/wayland_output.h b/ui/ozone/platform/wayland/wayland_output.h
index 39e50829caffbe40977a11595cdc454f8938b026..7187a412921601b9325ab841bff36ec796b3efab 100644
--- a/ui/ozone/platform/wayland/wayland_output.h
+++ b/ui/ozone/platform/wayland/wayland_output.h
@@ -16,19 +16,11 @@ namespace ui {
 // that are available to the application.
 class WaylandOutput {
  public:
-  class Observer {
-   public:
-    // Will be called when wl_output is available.
-    virtual void OnOutputReadyForUse() = 0;
-  };
-
-  WaylandOutput(wl_output*);
+  WaylandOutput(wl_output*, uint32_t name);
   ~WaylandOutput();
 
   // Returns the geometry of the output.
   gfx::Rect Geometry() const { return rect_; }
-  void SetObserver(Observer* observer) { observer_ = observer; }
-  Observer* observer() { return observer_; }
 
  private:
   // Callback functions used for setting geometric properties of the output
@@ -52,10 +44,9 @@ class WaylandOutput {
                                int32_t refresh);
 
   wl::Object<wl_output> output_;
+  int32_t name_;
   gfx::Rect rect_;
 
-  Observer* observer_;
-
   DISALLOW_COPY_AND_ASSIGN(WaylandOutput);
 };