Unify display ids between Display and PlatformDisplay.

services/ui/ws/platform_display.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 SERVICES_UI_WS_PLATFORM_DISPLAY_H_
 #define SERVICES_UI_WS_PLATFORM_DISPLAY_H_
 
 #include <stdint.h>
 
 #include <map>
@@ skipping 38 matching lines @@
 struct PlatformDisplayInitParams;
 class ServerWindow;
 
 // PlatformDisplay is used to connect the root ServerWindow to a display.
 class PlatformDisplay {
  public:
   virtual ~PlatformDisplay() {}
 
   static PlatformDisplay* Create(const PlatformDisplayInitParams& init_params);
 
+  virtual int64_t GetId() const = 0;
+
   virtual void Init(PlatformDisplayDelegate* delegate) = 0;
 
   // Schedules a paint for the specified region in the coordinates of |window|.
   virtual void SchedulePaint(const ServerWindow* window,
                              const gfx::Rect& bounds) = 0;
 
   virtual void SetViewportSize(const gfx::Size& size) = 0;
 
   virtual void SetTitle(const base::string16& title) = 0;
 
   virtual void SetCapture() = 0;
 
   virtual void ReleaseCapture() = 0;
 
   virtual void SetCursorById(int32_t cursor) = 0;
 
   virtual ::display::Display::Rotation GetRotation() = 0;
 
   virtual float GetDeviceScaleFactor() = 0;
 
   virtual void UpdateTextInputState(const ui::TextInputState& state) = 0;
   virtual void SetImeVisibility(bool visible) = 0;
 
   // Returns true if a compositor frame has been submitted but not drawn yet.
   virtual bool IsFramePending() const = 0;
 
   virtual void RequestCopyOfOutput(
       std::unique_ptr<cc::CopyOutputRequest> output_request) = 0;
 
-  virtual int64_t GetDisplayId() const = 0;
-
   virtual gfx::Rect GetBounds() const = 0;
 
   // Overrides factory for testing. Default (NULL) value indicates regular
   // (non-test) environment.
   static void set_factory_for_testing(PlatformDisplayFactory* factory) {
     PlatformDisplay::factory_ = factory;
   }
 
  private:
   // Static factory instance (always NULL for non-test).
   static PlatformDisplayFactory* factory_;
 };
 
 // PlatformDisplay implementation that connects to the services necessary to
 // actually display.
 class DefaultPlatformDisplay : public PlatformDisplay,
                                public ui::PlatformWindowDelegate,
                                private FrameGeneratorDelegate {
  public:
   explicit DefaultPlatformDisplay(const PlatformDisplayInitParams& init_params);
   ~DefaultPlatformDisplay() override;
 
   // PlatformDisplay:
   void Init(PlatformDisplayDelegate* delegate) override;
+  int64_t GetId() const override;
   void SchedulePaint(const ServerWindow* window,
                      const gfx::Rect& bounds) override;
   void SetViewportSize(const gfx::Size& size) override;
   void SetTitle(const base::string16& title) override;
   void SetCapture() override;
   void ReleaseCapture() override;
   void SetCursorById(int32_t cursor) override;
   float GetDeviceScaleFactor() override;
   ::display::Display::Rotation GetRotation() override;
   void UpdateTextInputState(const ui::TextInputState& state) override;
   void SetImeVisibility(bool visible) override;
   bool IsFramePending() const override;
   void RequestCopyOfOutput(
       std::unique_ptr<cc::CopyOutputRequest> output_request) override;
-  int64_t GetDisplayId() const override;
   gfx::Rect GetBounds() const override;
 
  private:
   void UpdateMetrics(const gfx::Rect& bounds, float device_scale_factor);
 
   // ui::PlatformWindowDelegate:
   void OnBoundsChanged(const gfx::Rect& new_bounds) override;
   void OnDamageRect(const gfx::Rect& damaged_region) override;
   void DispatchEvent(ui::Event* event) override;
   void OnCloseRequest() override;
   void OnClosed() override;
   void OnWindowStateChanged(ui::PlatformWindowState new_state) override;
   void OnLostCapture() override;
   void OnAcceleratedWidgetAvailable(gfx::AcceleratedWidget widget,
                                     float device_scale_factor) override;
   void OnAcceleratedWidgetDestroyed() override;
   void OnActivationChanged(bool active) override;
 
   // FrameGeneratorDelegate:
   ServerWindow* GetRootWindow() override;
   void OnCompositorFrameDrawn() override;
   bool IsInHighContrastMode() override;
   const ViewportMetrics& GetViewportMetrics() override;
 
-  int64_t display_id_;
+  int64_t id_;
 
 #if !defined(OS_ANDROID)
   std::unique_ptr<ui::CursorLoader> cursor_loader_;
 #endif
 
   PlatformDisplayDelegate* delegate_ = nullptr;
   std::unique_ptr<FrameGenerator> frame_generator_;
 
   ViewportMetrics metrics_;
   std::unique_ptr<ui::PlatformWindow> platform_window_;
 
   DISALLOW_COPY_AND_ASSIGN(DefaultPlatformDisplay);
 };
 
 }  // namespace ws
 
 }  // namespace ui
 
 #endif  // SERVICES_UI_WS_PLATFORM_DISPLAY_H_