aura: Unify WindowTreeHost for some platforms

ui/aura/window_tree_host_platform.h

-// Copyright (c) 2012 The Chromium Authors. All rights reserved.
+// Copyright 2015 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 UI_AURA_WINDOW_TREE_HOST_WIN_H_
-#define UI_AURA_WINDOW_TREE_HOST_WIN_H_
+#ifndef UI_AURA_WINDOW_TREE_HOST_PLATFORM_H_
+#define UI_AURA_WINDOW_TREE_HOST_PLATFORM_H_
 
 #include "base/compiler_specific.h"
 #include "base/memory/scoped_ptr.h"
 #include "ui/aura/aura_export.h"
 #include "ui/aura/window_tree_host.h"
+#include "ui/gfx/native_widget_types.h"
 #include "ui/platform_window/platform_window.h"
 #include "ui/platform_window/platform_window_delegate.h"
 
 namespace aura {
 
-class AURA_EXPORT WindowTreeHostWin
+// The unified WindowTreeHost implementation for platforms
+// that implement PlatformWindow.
+class AURA_EXPORT WindowTreeHostPlatform
     : public WindowTreeHost,
       public NON_EXPORTED_BASE(ui::PlatformWindowDelegate) {
  public:
-  explicit WindowTreeHostWin(const gfx::Rect& bounds);
-  ~WindowTreeHostWin() override;
+  explicit WindowTreeHostPlatform(const gfx::Rect& bounds);
+  ~WindowTreeHostPlatform() override;
 
+ public:

[sadrul, 2015/10/15 19:47:40]

not needed.

[no sievers, 2015/10/16 18:26:15]

Done.

   // WindowTreeHost:
   ui::EventSource* GetEventSource() override;
   gfx::AcceleratedWidget GetAcceleratedWidget() override;
   void ShowImpl() override;
   void HideImpl() override;
   gfx::Rect GetBounds() const override;
   void SetBounds(const gfx::Rect& bounds) override;
   gfx::Point GetLocationOnNativeScreen() const override;
   void SetCapture() override;
   void ReleaseCapture() override;
   void SetCursorNative(gfx::NativeCursor cursor) override;
   void MoveCursorToNative(const gfx::Point& location) override;
   void OnCursorVisibilityChangedNative(bool show) override;
 
  protected:
-  gfx::AcceleratedWidget hwnd() const { return widget_; }
+  ui::PlatformWindow* platform_window() { return window_.get(); }
 
  private:
   // 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_pixel_ratio) override;
   void OnActivationChanged(bool active) override;
 
+  gfx::AcceleratedWidget widget_;
+  scoped_ptr<ui::PlatformWindow> window_;
+  gfx::NativeCursor current_cursor_;
   bool has_capture_;
   gfx::Rect bounds_;
-  gfx::AcceleratedWidget widget_;
-  scoped_ptr<ui::PlatformWindow> window_;
 
-  DISALLOW_COPY_AND_ASSIGN(WindowTreeHostWin);
+  DISALLOW_COPY_AND_ASSIGN(WindowTreeHostPlatform);
 };
 
 }  // namespace aura
 
-#endif  // UI_AURA_WINDOW_TREE_HOST_WIN_H_
+#endif  // UI_AURA_WINDOW_TREE_HOST_PLATFORM_H_