Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(2509)

Unified Diff: ash/common/wm/wm_snap_to_pixel_layout_manager.cc

Issue 2746873003: Refactor PanelLayoutManager to use aura::LayoutManager (Closed)
Patch Set: minor Created 3 years, 9 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:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « ash/common/wm/panels/panel_layout_manager.cc ('k') | ash/root_window_controller.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/common/wm/wm_snap_to_pixel_layout_manager.cc
diff --git a/ash/common/wm/wm_snap_to_pixel_layout_manager.cc b/ash/common/wm/wm_snap_to_pixel_layout_manager.cc
index 79afc8959f080494fe688109b5c6bc053c834e07..7a604f11addf80e158e5f05fa84e89ba40f4d31e 100644
--- a/ash/common/wm/wm_snap_to_pixel_layout_manager.cc
+++ b/ash/common/wm/wm_snap_to_pixel_layout_manager.cc
@@ -24,7 +24,7 @@ void WmSnapToPixelLayoutManager::InstallOnContainers(WmWindow* window) {
child->GetShellWindowId() > kShellWindowId_Max) // not a container
continue;
if (child->aura_window()->GetProperty(kSnapChildrenToPixelBoundary)) {
- if (!child->GetLayoutManager())
+ if (!child->GetLayoutManager() && !child->aura_window()->layout_manager())
child->SetLayoutManager(base::MakeUnique<WmSnapToPixelLayoutManager>());
} else {
InstallOnContainers(child);
« no previous file with comments | « ash/common/wm/panels/panel_layout_manager.cc ('k') | ash/root_window_controller.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698