Refactors DimWindow and moves to ash/common

ash/mus/bridge/wm_window_mus.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/mus/bridge/wm_window_mus.h"
 
 #include "ash/common/wm/container_finder.h"
 #include "ash/common/wm/window_state.h"
 #include "ash/common/wm_layout_manager.h"
 #include "ash/common/wm_transient_window_observer.h"
@@ skipping 93 matching lines @@
     : window_(window),
       // Matches aura, see aura::Window for details.
       observers_(base::ObserverList<WmWindowObserver>::NOTIFY_EXISTING_ONLY) {
   window_->AddObserver(this);
   window_->SetLocalProperty(kWmWindowKey, this);
   window_state_.reset(new WindowStateMus(this));
 }
 
 WmWindowMus::~WmWindowMus() {
   window_->RemoveObserver(this);
+
+  DestroyUserData();
 }
 
 // static
 WmWindowMus* WmWindowMus::Get(ui::Window* window) {
   if (!window)
     return nullptr;
 
   WmWindowMus* wm_window = window->GetLocalProperty(kWmWindowKey);
   if (wm_window)
     return wm_window;
@@ skipping 27 matching lines @@
 
 bool WmWindowMus::ShouldUseExtendedHitRegion() const {
   const WmWindowMus* parent = Get(window_->parent());
   return parent && parent->children_use_extended_hit_region_;
 }
 
 bool WmWindowMus::IsContainer() const {
   return GetShellWindowId() != kShellWindowId_Invalid;
 }
 
+void WmWindowMus::Destroy() {
+  window_->Destroy();
+}
+
 const WmWindow* WmWindowMus::GetRootWindow() const {
   return Get(window_->GetRoot());
 }
 
 WmRootWindowController* WmWindowMus::GetRootWindowController() {
   return GetRootWindowControllerMus();
 }
 
 WmShell* WmWindowMus::GetShell() const {
   return WmShellMus::Get();
@@ skipping 21 matching lines @@
 
 void WmWindowMus::SetShellWindowId(int id) {
   shell_window_id_ = id;
 }
 
 int WmWindowMus::GetShellWindowId() const {
   return shell_window_id_;
 }
 
 ui::wm::WindowType WmWindowMus::GetType() const {
-  return GetWmWindowType(window_);
+  return is_wm_window_type_set_ ? wm_window_type_ : GetWmWindowType(window_);

[James Cook, 2016/09/09 00:03:36]

Is it not sufficient to return wm_window_type_ if it's not equal to
WINDOW_TYPE_UNKNOWN? Or rather, you want to return WINDOW_TYPE_UNKNOWN if
someone explicitly sets it?

[sky, 2016/09/09 03:50:04]

Ya, sorry, this is mildly confusing. I added a comment that hopefully clarifies
things. I could have also go with setting the windowtype on the window, but that
requires a reverse mapping type, which isn't very satisfying either. See
GetWmWindowType in property_util for what I mean.

 }
 
 bool WmWindowMus::IsBubble() {
   return GetWindowType(window_) == ui::mojom::WindowType::BUBBLE;
 }
 
 ui::Layer* WmWindowMus::GetLayer() {
   // TODO(sky): this function should be nuked entirely.
   NOTIMPLEMENTED();
   return widget_ ? widget_->GetLayer() : nullptr;
@@ skipping 206 matching lines @@
   } else {
     layout_manager_adapter_.reset();
   }
 }
 
 WmLayoutManager* WmWindowMus::GetLayoutManager() {
   return layout_manager_adapter_ ? layout_manager_adapter_->layout_manager()
                                  : nullptr;
 }
 
+void WmWindowMus::SetVisibilityChangesAnimated() {
+  // TODO: need animation support: http://crbug.com/615087.
+  NOTIMPLEMENTED();
+}
+
 void WmWindowMus::SetVisibilityAnimationType(int type) {
   // TODO: need animation support: http://crbug.com/615087.
   NOTIMPLEMENTED();
 }
 
 void WmWindowMus::SetVisibilityAnimationDuration(base::TimeDelta delta) {
   // TODO: need animation support: http://crbug.com/615087.
   NOTIMPLEMENTED();
 }
 
@@ skipping 431 matching lines @@
 }
 
 void WmWindowMus::OnTransientChildRemoved(ui::Window* window,
                                           ui::Window* transient) {
   FOR_EACH_OBSERVER(WmTransientWindowObserver, transient_observers_,
                     OnTransientChildRemoved(this, Get(transient)));
 }
 
 }  // namespace mus
 }  // namespace ash