Converts ash to use aura-mus

ash/aura/wm_window_aura.cc

 // Copyright 2016 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/aura/wm_window_aura.h"
 
 #include "ash/aura/aura_layout_manager_adapter.h"
 #include "ash/aura/wm_root_window_controller_aura.h"
 #include "ash/aura/wm_shell_aura.h"
 #include "ash/common/ash_constants.h"
@@ skipping 11 matching lines @@
 #include "ash/wm/window_animations.h"
 #include "ash/wm/window_mirror_view.h"
 #include "ash/wm/window_properties.h"
 #include "ash/wm/window_state_aura.h"
 #include "ash/wm/window_util.h"
 #include "base/memory/ptr_util.h"
 #include "services/ui/public/interfaces/window_manager_constants.mojom.h"
 #include "ui/aura/client/aura_constants.h"
 #include "ui/aura/client/focus_client.h"
 #include "ui/aura/client/window_parenting_client.h"
+#include "ui/aura/env.h"
 #include "ui/aura/layout_manager.h"
 #include "ui/aura/window.h"
 #include "ui/aura/window_delegate.h"
 #include "ui/aura/window_property.h"
 #include "ui/base/hit_test.h"
 #include "ui/compositor/layer_tree_owner.h"
 #include "ui/compositor/scoped_layer_animation_settings.h"
 #include "ui/display/screen.h"
 #include "ui/gfx/geometry/insets.h"
 #include "ui/views/widget/widget.h"
@@ skipping 36 matching lines @@
   void SetBounds(aura::Window* window, const gfx::Rect& bounds) {
     SetChildBoundsDirect(window, bounds);
   }
 
  private:
   DISALLOW_COPY_AND_ASSIGN(BoundsSetter);
 };
 
 }  // namespace
 
-WmWindowAura::WmWindowAura(aura::Window* window)
-    : window_(window),
-      // Mirrors that of aura::Window.
-      observers_(base::ObserverList<WmWindowObserver>::NOTIFY_EXISTING_ONLY) {
-  window_->AddObserver(this);
-  window_->SetProperty(kWmWindowKey, this);
-}
-
 WmWindowAura::~WmWindowAura() {
   if (added_transient_observer_)
     ::wm::TransientWindowManager::Get(window_)->RemoveObserver(this);
 
   window_->RemoveObserver(this);
 }
 
 // static
 const WmWindow* WmWindowAura::Get(const aura::Window* window) {
   if (!window)
     return nullptr;
 
   const WmWindow* wm_window = window->GetProperty(kWmWindowKey);
   if (wm_window)
     return wm_window;
+  DCHECK_EQ(aura::Env::Mode::LOCAL, aura::Env::GetInstance()->mode());
   // WmWindowAura is owned by the aura::Window.
   // TODO(sky): fix constness.
   return new WmWindowAura(const_cast<aura::Window*>(window));
 }
 
 // static
 std::vector<WmWindow*> WmWindowAura::FromAuraWindows(
     const std::vector<aura::Window*>& aura_windows) {
   std::vector<WmWindow*> result(aura_windows.size());
   for (size_t i = 0; i < aura_windows.size(); ++i)
@@ skipping 710 matching lines @@
 
 void WmWindowAura::AddLimitedPreTargetHandler(ui::EventHandler* handler) {
   // This behaves differently from WmWindowMus for child and embedded windows.
   window_->AddPreTargetHandler(handler);
 }
 
 void WmWindowAura::RemoveLimitedPreTargetHandler(ui::EventHandler* handler) {
   window_->RemovePreTargetHandler(handler);
 }
 
+WmWindowAura::WmWindowAura(aura::Window* window)
+    : window_(window),
+      // Mirrors that of aura::Window.
+      observers_(base::ObserverList<WmWindowObserver>::NOTIFY_EXISTING_ONLY) {
+  window_->AddObserver(this);
+  window_->SetProperty(kWmWindowKey, this);
+}
+
+// static
+bool WmWindowAura::HasInstance(const aura::Window* window) {
+  return window->GetProperty(kWmWindowKey) != nullptr;
+}
+
 void WmWindowAura::OnWindowHierarchyChanging(
     const HierarchyChangeParams& params) {
   WmWindowObserver::TreeChangeParams wm_params;
   wm_params.target = Get(params.target);
   wm_params.new_parent = Get(params.new_parent);
   wm_params.old_parent = Get(params.old_parent);
   for (auto& observer : observers_)
     observer.OnWindowTreeChanging(this, wm_params);
 }
 
@@ skipping 88 matching lines @@
     observer.OnTransientChildAdded(this, Get(transient));
 }
 
 void WmWindowAura::OnTransientChildRemoved(aura::Window* window,
                                            aura::Window* transient) {
   for (auto& observer : transient_observers_)
     observer.OnTransientChildRemoved(this, Get(transient));
 }
 
 }  // namespace ash