| Index: ash/wm/frame_painter.cc
|
| diff --git a/ash/wm/frame_painter.cc b/ash/wm/frame_painter.cc
|
| index 2c0a43c30a97e3ac3bde5d62c604c4b4a85a9550..647e3a000962ae9e7a6159c94b60354aca496c21 100644
|
| --- a/ash/wm/frame_painter.cc
|
| +++ b/ash/wm/frame_painter.cc
|
| @@ -609,7 +609,10 @@ bool FramePainter::UseSoloWindowHeader() {
|
| for (std::set<FramePainter*>::const_iterator it = instances_->begin();
|
| it != instances_->end();
|
| ++it) {
|
| - if (IsVisibleNormalWindow((*it)->window_)) {
|
| + // The window needs to be a 'normal window'. To exclude constrained windows
|
| + // the existence of a layout manager gets additionally tested.
|
| + if (IsVisibleNormalWindow((*it)->window_) &&
|
| + (!(*it)->window_->GetProperty(aura::client::kConstrainedWindowKey))) {
|
| window_count++;
|
| if (window_count > 1)
|
| return false;
|
|
|