Index: ash/wm/frame_painter.cc |
diff --git a/ash/wm/frame_painter.cc b/ash/wm/frame_painter.cc |
index 7f166437057211b31c4cdd17c72c2409cd13c2f7..5ccda29bf09882b50c21cea9006d2d295ac55b08 100644 |
--- a/ash/wm/frame_painter.cc |
+++ b/ash/wm/frame_painter.cc |
@@ -791,9 +791,8 @@ int FramePainter::AdjustFrameHitCodeForMaximizedModes(int hit_code) { |
bool FramePainter::UseSoloWindowHeader() { |
aura::RootWindow* root = window_->GetRootWindow(); |
- if (!root) |
+ if (!root || root->GetProperty(internal::kIgnoreSoloWindowFramePainterPolicy)) |
return false; |
- |
return (root->GetProperty(internal::kSoloWindowFramePainterKey) == this); |
} |