diff options
| author | varkha@chromium.org <varkha@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-10-16 03:48:47 +0000 |
|---|---|---|
| committer | varkha@chromium.org <varkha@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-10-16 03:48:47 +0000 |
| commit | 4d22e600b5dfcb8558bc4baa2258d2ab0adabaf0 (patch) | |
| tree | 00cf08c59fe9f21937dd1d418a1114eb5b1fe149 /ash/shelf | |
| parent | 318ce0f44c70535e4934a150e6af6637c77e0d93 (diff) | |
| download | chromium_src-4d22e600b5dfcb8558bc4baa2258d2ab0adabaf0.zip chromium_src-4d22e600b5dfcb8558bc4baa2258d2ab0adabaf0.tar.gz chromium_src-4d22e600b5dfcb8558bc4baa2258d2ab0adabaf0.tar.bz2 | |
Update dock size when auto-hiding shelf
BUG=298210
TEST=ash_unittests --gtest_filter=*AttachOneAutoHideShelf*
Review URL: https://codereview.chromium.org/26662002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@228858 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ash/shelf')
| -rw-r--r-- | ash/shelf/shelf_layout_manager.cc | 6 | ||||
| -rw-r--r-- | ash/shelf/shelf_layout_manager.h | 4 |
2 files changed, 8 insertions, 2 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(); diff --git a/ash/shelf/shelf_layout_manager.h b/ash/shelf/shelf_layout_manager.h index 4865964..d8b6e8f 100644 --- a/ash/shelf/shelf_layout_manager.h +++ b/ash/shelf/shelf_layout_manager.h @@ -332,7 +332,9 @@ class ASH_EXPORT ShelfLayoutManager : const gfx::Rect& keyboard_bounds) OVERRIDE; // Overridden from dock::DockObserver: - virtual void OnDockBoundsChanging(const gfx::Rect& dock_bounds) OVERRIDE; + virtual void OnDockBoundsChanging( + const gfx::Rect& dock_bounds, + DockedWindowLayoutManagerObserver::Reason reason) OVERRIDE; // Generates insets for inward edge based on the current shelf alignment. gfx::Insets GetInsetsForAlignment(int distance) const; |