aura: Unify WindowTreeHost for some platforms

ash/host/ash_window_tree_host_ozone.cc

 // 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.
 
 #include "ash/host/ash_window_tree_host.h"
 
 #include "ash/host/ash_window_tree_host_init_params.h"
 #include "ash/host/ash_window_tree_host_unified.h"
 #include "ash/host/root_window_transformer.h"
 #include "ash/host/transformer_helper.h"
 #include "ash/ime/input_method_event_handler.h"
 #include "base/command_line.h"
 #include "base/trace_event/trace_event.h"
 #include "ui/aura/window.h"
-#include "ui/aura/window_tree_host_ozone.h"
+#include "ui/aura/window_tree_host_platform.h"
 #include "ui/events/event_processor.h"
 #include "ui/events/null_event_targeter.h"
 #include "ui/gfx/geometry/insets.h"
 #include "ui/gfx/transform.h"
 #include "ui/ozone/public/input_controller.h"
 #include "ui/ozone/public/ozone_platform.h"
 #include "ui/platform_window/platform_window.h"
 
 namespace ash {
 namespace {
 
 class AshWindowTreeHostOzone : public AshWindowTreeHost,
-                               public aura::WindowTreeHostOzone {
+                               public aura::WindowTreeHostPlatform {
  public:
   explicit AshWindowTreeHostOzone(const gfx::Rect& initial_bounds);
   ~AshWindowTreeHostOzone() override;
 
  private:
   // AshWindowTreeHost:
   void ToggleFullScreen() override;
   bool ConfineCursorToRootWindow() override;
   void UnConfineCursor() override;
   void SetRootWindowTransformer(
@@ skipping 15 matching lines @@
 
   // Temporarily disable the tap-to-click feature. Used on CrOS.
   void SetTapToClickPaused(bool state);
 
   TransformerHelper transformer_helper_;
 
   DISALLOW_COPY_AND_ASSIGN(AshWindowTreeHostOzone);
 };
 
 AshWindowTreeHostOzone::AshWindowTreeHostOzone(const gfx::Rect& initial_bounds)
-    : aura::WindowTreeHostOzone(initial_bounds), transformer_helper_(this) {
+    : aura::WindowTreeHostPlatform(initial_bounds), transformer_helper_(this) {
   transformer_helper_.Init();
 }
 
 AshWindowTreeHostOzone::~AshWindowTreeHostOzone() {
 }
 
 void AshWindowTreeHostOzone::ToggleFullScreen() {
   NOTIMPLEMENTED();
 }
 
@@ skipping 45 matching lines @@
 
 void AshWindowTreeHostOzone::UpdateRootWindowSize(const gfx::Size& host_size) {
   transformer_helper_.UpdateWindowSize(host_size);
 }
 
 void AshWindowTreeHostOzone::OnCursorVisibilityChangedNative(bool show) {
   SetTapToClickPaused(!show);
 }
 
 void AshWindowTreeHostOzone::SetBounds(const gfx::Rect& bounds) {
-  WindowTreeHostOzone::SetBounds(bounds);
+  WindowTreeHostPlatform::SetBounds(bounds);
   ConfineCursorToRootWindow();
 }
 
 void AshWindowTreeHostOzone::DispatchEvent(ui::Event* event) {
   TRACE_EVENT0("input", "AshWindowTreeHostOzone::DispatchEvent");
   if (event->IsLocatedEvent())
     TranslateLocatedEvent(static_cast<ui::LocatedEvent*>(event));
   SendEventToProcessor(event);
 }
 
@@ skipping 20 matching lines @@
 }  // namespace
 
 AshWindowTreeHost* AshWindowTreeHost::Create(
     const AshWindowTreeHostInitParams& init_params) {
   if (init_params.offscreen)
     return new AshWindowTreeHostUnified(init_params.initial_bounds);
   return new AshWindowTreeHostOzone(init_params.initial_bounds);
 }
 
 }  // namespace ash