ash/wm/window_state.cc - Issue 115453004: Moves management of transients out of Window

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/window_state.cc

Issue 115453004: Moves management of transients out of Window (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: fix MRUWindowTracker and MultiProfileMultiBrowserShelfLayoutChromeLauncherControllerTest Created 7 years 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/window_state.cc

diff --git a/ash/wm/window_state.cc b/ash/wm/window_state.cc

index 4bc1484f9b81e794f389f5daa5aa4ca381247462..ba7043362725587b8e26756e4ff8e7e4117de366 100644

--- a/ash/wm/window_state.cc

+++ b/ash/wm/window_state.cc

@@ -19,6 +19,7 @@

#include "ui/aura/window.h"

#include "ui/aura/window_delegate.h"

#include "ui/gfx/display.h"

+#include "ui/views/corewm/transient_window_manager.h"

#include "ui/views/corewm/window_util.h"

namespace ash {

@@ -138,7 +139,7 @@ bool WindowState::CanActivate() const {

bool WindowState::CanSnap() const {

if (!CanResize() ||

window_->type() == aura::client::WINDOW_TYPE_PANEL ||

- window_->transient_parent())

+ views::corewm::GetTransientParent(window_))

return false;

// If a window has a maximum size defined, snapping may make it too big.

return window_->delegate() ? window_->delegate()->GetMaximumSize().IsEmpty() :