Refactor and push window properties up to class properties.

ui/aura/mus/window_tree_client.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 UI_AURA_MUS_WINDOW_TREE_CLIENT_H_
 #define UI_AURA_MUS_WINDOW_TREE_CLIENT_H_
 
 #include <stdint.h>
 
 #include <map>
@@ skipping 20 matching lines @@
 #include "ui/aura/mus/window_tree_host_mus_delegate.h"
 
 namespace display {
 class Display;
 }
 
 namespace gfx {
 class Insets;
 }
 
+namespace ui {
+struct PropertyData;
+}
+
 namespace service_manager {
 class Connector;
 }
 
 namespace ui {
 class Gpu;
 }
 
 namespace aura {
 class CaptureSynchronizer;
 class DragDropControllerMus;
 class FocusSynchronizer;
 class InFlightBoundsChange;
 class InFlightChange;
 class InFlightFocusChange;
 class InFlightPropertyChange;
 class InFlightVisibleChange;
 class MusContextFactory;
 class WindowMus;
 class WindowPortMus;
-struct WindowPortPropertyData;
 class WindowTreeClientDelegate;
 class WindowTreeClientPrivate;
 class WindowTreeClientObserver;
 class WindowTreeClientTestObserver;
 class WindowTreeHostMus;
 
 namespace client {
 class CaptureClient;
 }
 
@@ skipping 209 matching lines @@
   void OnWindowMusDestroyed(WindowMus* window, Origin origin);
   void OnWindowMusBoundsChanged(WindowMus* window,
                                 const gfx::Rect& old_bounds,
                                 const gfx::Rect& new_bounds);
   void OnWindowMusAddChild(WindowMus* parent, WindowMus* child);
   void OnWindowMusRemoveChild(WindowMus* parent, WindowMus* child);
   void OnWindowMusMoveChild(WindowMus* parent,
                             size_t current_index,
                             size_t dest_index);
   void OnWindowMusSetVisible(WindowMus* window, bool visible);
-  std::unique_ptr<WindowPortPropertyData> OnWindowMusWillChangeProperty(
+  std::unique_ptr<ui::PropertyData> OnWindowMusWillChangeProperty(
       WindowMus* window,
       const void* key);
   void OnWindowMusPropertyChanged(WindowMus* window,
                                   const void* key,
-                                  std::unique_ptr<WindowPortPropertyData> data);
+                                  std::unique_ptr<ui::PropertyData> data);
 
   // Callback passed from WmPerformMoveLoop().
   void OnWmMoveLoopCompleted(uint32_t change_id, bool completed);
 
   // Overridden from WindowTreeClient:
   void OnEmbed(ClientSpecificId client_id,
                ui::mojom::WindowDataPtr root,
                ui::mojom::WindowTreePtr tree,
                int64_t display_id,
                Id focused_window_id,
@@ skipping 233 matching lines @@
   std::unique_ptr<ui::Gpu> gpu_;
   std::unique_ptr<MusContextFactory> compositor_context_factory_;
   base::WeakPtrFactory<WindowTreeClient> weak_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(WindowTreeClient);
 };
 
 }  // namespace aura
 
 #endif  // UI_AURA_MUS_WINDOW_TREE_CLIENT_H_