Adds a porting layer so aura can be made to work with mus

ui/aura/window.h

 // Copyright (c) 2012 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_H_
 #define UI_AURA_WINDOW_H_
 
 #include <stdint.h>
 
 #include <map>
 #include <memory>
+#include <set>
 #include <string>
 #include <vector>
 
 #include "base/compiler_specific.h"
 #include "base/macros.h"
 #include "base/observer_list.h"
 #include "base/strings/string16.h"
 #include "ui/aura/aura_export.h"
 #include "ui/aura/window_observer.h"
 #include "ui/compositor/layer_animator.h"
@@ skipping 21 matching lines @@
 class EventHandler;
 class Layer;
 class TextInputClient;
 class Texture;
 }
 
 namespace aura {
 
 class LayoutManager;
 class WindowDelegate;
+class WindowPort;
 class WindowObserver;
 class WindowTreeHost;
 
 // Defined in window_property.h (which we do not include)
 template<typename T>
 struct WindowProperty;
 
 namespace subtle {
 class PropertyHelper;
 }
@@ skipping 15 matching lines @@
 
   // Used when stacking windows.
   enum StackDirection {
     STACK_ABOVE,
     STACK_BELOW
   };
 
   typedef std::vector<Window*> Windows;
 
   explicit Window(WindowDelegate* delegate);
+  Window(WindowDelegate* delegate, std::unique_ptr<WindowPort> port);
   ~Window() override;
 
   // Initializes the window. This creates the window's layer.
   void Init(ui::LayerType layer_type);
 
   void set_owned_by_parent(bool owned_by_parent) {
     owned_by_parent_ = owned_by_parent;
   }
   bool owned_by_parent() const { return owned_by_parent_; }
 
@@ skipping 208 matching lines @@
   // Returns the value of the given window |property|.  Returns the
   // property-specific default value if the property was not previously set.
   template<typename T>
   T GetProperty(const WindowProperty<T>* property) const;
 
   // Sets the |property| to its default value. Useful for avoiding a cast when
   // setting to NULL.
   template<typename T>
   void ClearProperty(const WindowProperty<T>* property);
 
+  // Returns the value of all properties with a non-default value.
+  std::set<const void*> GetAllPropertKeys() const;
+
   // NativeWidget::[GS]etNativeWindowProperty use strings as keys, and this is
   // difficult to change while retaining compatibility with other platforms.
   // TODO(benrg): Find a better solution.
   void SetNativeWindowProperty(const char* key, void* value);
   void* GetNativeWindowProperty(const char* key) const;
 
   // Type of a function to delete a property that this window owns.
   typedef void (*PropertyDeallocator)(int64_t value);
 
   // Overridden from ui::LayerDelegate:
   void OnDeviceScaleFactorChanged(float device_scale_factor) override;
 
 #if !defined(NDEBUG)
   // These methods are useful when debugging.
   std::string GetDebugInfo() const;
   void PrintWindowHierarchy(int depth) const;
 #endif
 
   // Returns true if there was state needing to be cleaned up.
   bool CleanupGestureState();
 
  protected:
   // Deletes (or removes if not owned by parent) all child windows. Intended for
   // use from the destructor.
   void RemoveOrDestroyChildren();
 
  private:
-  friend class test::WindowTestApi;
   friend class LayoutManager;
+  friend class WindowPort;
   friend class WindowTargeter;
   friend class subtle::PropertyHelper;
+  friend class test::WindowTestApi;
+
   // Called by the public {Set,Get,Clear}Property functions.
   int64_t SetPropertyInternal(const void* key,
                               const char* name,
                               PropertyDeallocator deallocator,
                               int64_t value,
                               int64_t default_value);
   int64_t GetPropertyInternal(const void* key, int64_t default_value) const;
 
   // Returns true if the mouse pointer at relative-to-this-Window's-origin
   // |local_point| can trigger an event for this Window.
@@ skipping 96 matching lines @@
   bool CanAcceptEvent(const ui::Event& event) override;
   EventTarget* GetParentTarget() override;
   std::unique_ptr<ui::EventTargetIterator> GetChildIterator() const override;
   ui::EventTargeter* GetEventTargeter() override;
   void ConvertEventToTarget(ui::EventTarget* target,
                             ui::LocatedEvent* event) override;
 
   // Updates the layer name based on the window's name and id.
   void UpdateLayerName();
 
+  // Window owns its corresponding WindowPort, but the ref is held as a raw
+  // pointer so that |port_| is still valid while being destroyed. This is
+  // important as deleting the WindowPort may result in trying to lookup the
+  // |port_| associated with the Window.
+  WindowPort* port_;

[sadrul, 2016/10/26 04:25:55]

Should we still use a unique_ptr<> here, and std::move() that out in the dtor
with the explanation there?

[sky, 2016/10/26 16:25:21]

I still need the ability to get the port_ during destruction. I changed this to
a unique_ptr and add a WindowPort* member that references the port_.get().

+
   // Bounds of this window relative to the parent. This is cached as the bounds
   // of the Layer and Window are not necessarily the same. In particular bounds
   // of the Layer are relative to the first ancestor with a Layer, where as this
   // is relative to the parent Window.
   gfx::Rect bounds_;
 
   WindowTreeHost* host_;
 
   ui::wm::WindowType type_;
 
@@ skipping 45 matching lines @@
   };
 
   std::map<const void*, Value> prop_map_;
 
   DISALLOW_COPY_AND_ASSIGN(Window);
 };
 
 }  // namespace aura
 
 #endif  // UI_AURA_WINDOW_H_