ash/wm/stacking_controller.cc - Issue 13896026: Stick windows to sides of workspaces

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: ash/wm/stacking_controller.cc

Issue 13896026: Stick windows to sides of workspaces (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Dock with zero width (no logs) Created 7 years, 6 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

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);

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: