diff options
Diffstat (limited to 'ash/shelf/shelf_layout_manager.cc')
| -rw-r--r-- | ash/shelf/shelf_layout_manager.cc | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/ash/shelf/shelf_layout_manager.cc b/ash/shelf/shelf_layout_manager.cc index 390ab22..d5441c4 100644 --- a/ash/shelf/shelf_layout_manager.cc +++ b/ash/shelf/shelf_layout_manager.cc @@ -1127,7 +1127,11 @@ void ShelfLayoutManager::OnKeyboardBoundsChanging( } void ShelfLayoutManager::OnDockBoundsChanging( - const gfx::Rect& dock_bounds) { + const gfx::Rect& dock_bounds, + DockedWindowLayoutManagerObserver::Reason reason) { + // Skip shelf layout in case docked notification originates from this class. + if (reason == DISPLAY_INSETS_CHANGED) + return; if (dock_bounds_ != dock_bounds) { dock_bounds_ = dock_bounds; OnWindowResized(); |