| OLD | NEW |
| 1 // Copyright (c) 2013 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2013 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include "ash/wm/dock/docked_window_layout_manager.h" | 5 #include "ash/wm/dock/docked_window_layout_manager.h" |
| 6 | 6 |
| 7 #include "ash/ash_switches.h" | 7 #include "ash/ash_switches.h" |
| 8 #include "ash/screen_util.h" | 8 #include "ash/screen_util.h" |
| 9 #include "ash/shelf/shelf.h" | 9 #include "ash/shelf/shelf.h" |
| 10 #include "ash/shelf/shelf_constants.h" | 10 #include "ash/shelf/shelf_constants.h" |
| (...skipping 773 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 784 // DockedWindowLayoutManager, ShelfLayoutManagerObserver implementation: | 784 // DockedWindowLayoutManager, ShelfLayoutManagerObserver implementation: |
| 785 void DockedWindowLayoutManager::OnBackgroundUpdated( | 785 void DockedWindowLayoutManager::OnBackgroundUpdated( |
| 786 ShelfBackgroundType background_type, | 786 ShelfBackgroundType background_type, |
| 787 BackgroundAnimatorChangeType change_type) { | 787 BackgroundAnimatorChangeType change_type) { |
| 788 background_widget_->SetBackgroundType(background_type, change_type); | 788 background_widget_->SetBackgroundType(background_type, change_type); |
| 789 } | 789 } |
| 790 | 790 |
| 791 ///////////////////////////////////////////////////////////////////////////// | 791 ///////////////////////////////////////////////////////////////////////////// |
| 792 // DockedWindowLayoutManager, WindowStateObserver implementation: | 792 // DockedWindowLayoutManager, WindowStateObserver implementation: |
| 793 | 793 |
| 794 void DockedWindowLayoutManager::OnWindowShowTypeChanged( | 794 void DockedWindowLayoutManager::OnPreWindowShowTypeChange( |
| 795 wm::WindowState* window_state, | 795 wm::WindowState* window_state, |
| 796 wm::WindowShowType old_type) { | 796 wm::WindowShowType old_type) { |
| 797 aura::Window* window = window_state->window(); | 797 aura::Window* window = window_state->window(); |
| 798 if (IsPopupOrTransient(window)) | 798 if (IsPopupOrTransient(window)) |
| 799 return; | 799 return; |
| 800 // The window property will still be set, but no actual change will occur | 800 // The window property will still be set, but no actual change will occur |
| 801 // until OnFullscreenStateChange is called when exiting fullscreen. | 801 // until OnFullscreenStateChange is called when exiting fullscreen. |
| 802 if (in_fullscreen_) | 802 if (in_fullscreen_) |
| 803 return; | 803 return; |
| 804 if (window_state->IsMinimized()) { | 804 if (window_state->IsMinimized()) { |
| (...skipping 504 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1309 void DockedWindowLayoutManager::OnKeyboardBoundsChanging( | 1309 void DockedWindowLayoutManager::OnKeyboardBoundsChanging( |
| 1310 const gfx::Rect& keyboard_bounds) { | 1310 const gfx::Rect& keyboard_bounds) { |
| 1311 // This bounds change will have caused a change to the Shelf which does not | 1311 // This bounds change will have caused a change to the Shelf which does not |
| 1312 // propagate automatically to this class, so manually recalculate bounds. | 1312 // propagate automatically to this class, so manually recalculate bounds. |
| 1313 Relayout(); | 1313 Relayout(); |
| 1314 UpdateDockBounds(DockedWindowLayoutManagerObserver::KEYBOARD_BOUNDS_CHANGING); | 1314 UpdateDockBounds(DockedWindowLayoutManagerObserver::KEYBOARD_BOUNDS_CHANGING); |
| 1315 } | 1315 } |
| 1316 | 1316 |
| 1317 } // namespace internal | 1317 } // namespace internal |
| 1318 } // namespace ash | 1318 } // namespace ash |
| OLD | NEW |