Chromium Code Reviews| Index: ash/wm/stacking_controller.cc |
| diff --git a/ash/wm/stacking_controller.cc b/ash/wm/stacking_controller.cc |
| index 7b3337ff780f00c010a57752733168b60e9e760e..406b313471acfef2d376dda459e9882ed86a4d8d 100644 |
| --- a/ash/wm/stacking_controller.cc |
| +++ b/ash/wm/stacking_controller.cc |
| @@ -10,6 +10,7 @@ |
| #include "ash/shell_window_ids.h" |
| #include "ash/wm/always_on_top_controller.h" |
| #include "ash/wm/coordinate_conversion.h" |
| +#include "ash/wm/property_util.h" |
| #include "ash/wm/window_properties.h" |
| #include "ui/aura/client/aura_constants.h" |
| #include "ui/aura/root_window.h" |
| @@ -85,6 +86,9 @@ aura::Window* StackingController::GetDefaultParent(aura::Window* context, |
| return GetSystemModalContainer(target_root, window); |
| else if (HasTransientParentWindow(window)) |
| return GetContainerForWindow(window->transient_parent()); |
| + else if (IsWindowDocked(window)) |
| + return GetContainerById(target_root, |
| + internal::kShellWindowId_DockContainer); |
|
flackr
2013/06/11 17:59:31
nit: multi-line block requires curlies {}
varkha
2013/06/12 04:52:13
Eliminating the window property made this piece un
|
| return GetAlwaysOnTopController(target_root)->GetContainer(window); |
| case aura::client::WINDOW_TYPE_CONTROL: |
| return GetContainerById( |
| @@ -93,6 +97,9 @@ aura::Window* StackingController::GetDefaultParent(aura::Window* context, |
| if (IsPanelAttached(window)) |
| return GetContainerById(target_root, |
| internal::kShellWindowId_PanelContainer); |
| + else if (IsWindowDocked(window)) |
| + return GetContainerById(target_root, |
| + internal::kShellWindowId_DockContainer); |
| else |
| return GetAlwaysOnTopController(target_root)->GetContainer(window); |
| case aura::client::WINDOW_TYPE_MENU: |