Refactors DimWindow and moves to ash/common

ash/mus/bridge/wm_window_mus.cc

Index: ash/mus/bridge/wm_window_mus.cc
diff --git a/ash/mus/bridge/wm_window_mus.cc b/ash/mus/bridge/wm_window_mus.cc
index 84823022e8ed362bd8713621c610aa4458df3c17..c470b8accff4907db22d19f6c7152cbbbfb51bfe 100644
--- a/ash/mus/bridge/wm_window_mus.cc
+++ b/ash/mus/bridge/wm_window_mus.cc
@@ -111,6 +111,8 @@ WmWindowMus::WmWindowMus(ui::Window* window)
 
 WmWindowMus::~WmWindowMus() {
   window_->RemoveObserver(this);
+
+  DestroyUserData();
 }
 
 // static
@@ -158,6 +160,10 @@ bool WmWindowMus::IsContainer() const {
   return GetShellWindowId() != kShellWindowId_Invalid;
 }
 
+void WmWindowMus::Destroy() {
+  window_->Destroy();
+}
+
 const WmWindow* WmWindowMus::GetRootWindow() const {
   return Get(window_->GetRoot());
 }
@@ -199,7 +205,7 @@ int WmWindowMus::GetShellWindowId() const {
 }
 
 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() {
@@ -426,6 +432,11 @@ WmLayoutManager* WmWindowMus::GetLayoutManager() {
                                  : 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();