| Index: ui/wm/core/window_modality_controller.cc
|
| diff --git a/ui/wm/core/window_modality_controller.cc b/ui/wm/core/window_modality_controller.cc
|
| index 094acc49189b86f2d21d4dbade56e7b8b7e1486d..ec51e5cba1044854cd9eafa7cd28655011f0f307 100644
|
| --- a/ui/wm/core/window_modality_controller.cc
|
| +++ b/ui/wm/core/window_modality_controller.cc
|
| @@ -22,11 +22,11 @@
|
| #include "ui/wm/core/window_util.h"
|
|
|
| namespace wm {
|
| +// const char kHasIndependentBoundsKey[] = "INDEPENDENT_BOUNDS";
|
|
|
| // Transient child's modal parent.
|
| extern const aura::WindowProperty<aura::Window*>* const kModalParentKey;
|
| DEFINE_WINDOW_PROPERTY_KEY(aura::Window*, kModalParentKey, NULL);
|
| -
|
| namespace {
|
|
|
| bool HasAncestor(aura::Window* window, aura::Window* ancestor) {
|
| @@ -82,8 +82,11 @@ aura::Window* GetModalTransientChild(
|
|
|
| } // namespace
|
|
|
| -void SetModalParent(aura::Window* child, aura::Window* parent) {
|
| +void SetModalParent(aura::Window* child, aura::Window* parent,
|
| + bool* independent, const char * kHasIndependentBoundsKey) {
|
| child->SetProperty(kModalParentKey, parent);
|
| + if (kHasIndependentBoundsKey)
|
| + child->SetNativeWindowProperty(kHasIndependentBoundsKey, independent);
|
| }
|
|
|
| aura::Window* GetModalTransient(aura::Window* window) {
|
|
|