Ports SystemModalContainerLayoutManager to ash/common

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 288 matching lines @@
 void WmWindowAura::SetColorProperty(WmWindowProperty key, SkColor value) {
   if (key == WmWindowProperty::TOP_VIEW_COLOR) {
     window_->SetProperty(aura::client::kTopViewColor, value);
     return;
   }
 
   NOTREACHED();
 }
 
 int WmWindowAura::GetIntProperty(WmWindowProperty key) {
+  if (key == WmWindowProperty::MODAL_TYPE)
+    return window_->GetProperty(aura::client::kModalKey);
+
   if (key == WmWindowProperty::SHELF_ID)
     return GetShelfIDForWindow(window_);
 
   if (key == WmWindowProperty::TOP_VIEW_INSET)
     return window_->GetProperty(aura::client::kTopViewInset);
 
   NOTREACHED();
   return 0;
 }
 
@@ skipping 472 matching lines @@
 }
 
 void WmWindowAura::OnWindowPropertyChanged(aura::Window* window,
                                            const void* key,
                                            intptr_t old) {
   if (key == aura::client::kShowStateKey) {
     ash::wm::GetWindowState(window_)->OnWindowShowStateChanged();
     return;
   }
   WmWindowProperty wm_property;
-  if (key == kSnapChildrenToPixelBoundary) {
-    wm_property = WmWindowProperty::SNAP_CHILDREN_TO_PIXEL_BOUNDARY;
-  } else if (key == aura::client::kAlwaysOnTopKey) {
+  if (key == aura::client::kAlwaysOnTopKey) {
     wm_property = WmWindowProperty::ALWAYS_ON_TOP;
+  } else if (key == aura::client::kExcludeFromMruKey) {
+    wm_property = WmWindowProperty::EXCLUDE_FROM_MRU;
+  } else if (key == aura::client::kModalKey) {
+    wm_property = WmWindowProperty::MODAL_TYPE;
   } else if (key == kShelfID) {
     wm_property = WmWindowProperty::SHELF_ID;
   } else if (key == kShelfItemDetailsKey) {
     wm_property = WmWindowProperty::SHELF_ITEM_DETAILS;
+  } else if (key == kSnapChildrenToPixelBoundary) {
+    wm_property = WmWindowProperty::SNAP_CHILDREN_TO_PIXEL_BOUNDARY;
   } else if (key == aura::client::kTopViewInset) {
     wm_property = WmWindowProperty::TOP_VIEW_INSET;
-  } else if (key == aura::client::kExcludeFromMruKey) {
-    wm_property = WmWindowProperty::EXCLUDE_FROM_MRU;
   } else {
     return;
   }
   FOR_EACH_OBSERVER(WmWindowObserver, observers_,
                     OnWindowPropertyChanged(this, wm_property));
 }
 
 void WmWindowAura::OnWindowBoundsChanged(aura::Window* window,
                                          const gfx::Rect& old_bounds,
                                          const gfx::Rect& new_bounds) {
@@ skipping 31 matching lines @@
                     OnTransientChildAdded(this, Get(transient)));
 }
 
 void WmWindowAura::OnTransientChildRemoved(aura::Window* window,
                                            aura::Window* transient) {
   FOR_EACH_OBSERVER(WmTransientWindowObserver, transient_observers_,
                     OnTransientChildRemoved(this, Get(transient)));
 }
 
 }  // namespace ash