OLD | NEW |
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 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/shelf/shelf_layout_manager.h" | 5 #include "ash/shelf/shelf_layout_manager.h" |
6 | 6 |
7 #include <algorithm> | 7 #include <algorithm> |
8 #include <cmath> | 8 #include <cmath> |
9 #include <cstring> | 9 #include <cstring> |
10 #include <string> | 10 #include <string> |
(...skipping 1101 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1112 // window. | 1112 // window. |
1113 if (session_state_delegate->IsUserSessionBlocked() && | 1113 if (session_state_delegate->IsUserSessionBlocked() && |
1114 keyboard_is_about_to_hide) { | 1114 keyboard_is_about_to_hide) { |
1115 Shell::GetInstance()->SetDisplayWorkAreaInsets(root_window_, gfx::Insets()); | 1115 Shell::GetInstance()->SetDisplayWorkAreaInsets(root_window_, gfx::Insets()); |
1116 } | 1116 } |
1117 } | 1117 } |
1118 | 1118 |
1119 void ShelfLayoutManager::OnDockBoundsChanging( | 1119 void ShelfLayoutManager::OnDockBoundsChanging( |
1120 const gfx::Rect& dock_bounds, | 1120 const gfx::Rect& dock_bounds, |
1121 DockedWindowLayoutManagerObserver::Reason reason) { | 1121 DockedWindowLayoutManagerObserver::Reason reason) { |
1122 // Skip shelf layout in case docked notification originates from this class. | |
1123 if (reason == DISPLAY_INSETS_CHANGED) | |
1124 return; | |
1125 if (dock_bounds_ != dock_bounds) { | 1122 if (dock_bounds_ != dock_bounds) { |
1126 dock_bounds_ = dock_bounds; | 1123 dock_bounds_ = dock_bounds; |
| 1124 // Skip shelf layout in case docked notification originates from this class. |
| 1125 if (reason == DISPLAY_INSETS_CHANGED) |
| 1126 return; |
1127 OnWindowResized(); | 1127 OnWindowResized(); |
1128 UpdateVisibilityState(); | 1128 UpdateVisibilityState(); |
1129 UpdateShelfBackground(BACKGROUND_CHANGE_ANIMATE); | 1129 UpdateShelfBackground(BACKGROUND_CHANGE_ANIMATE); |
1130 } | 1130 } |
1131 } | 1131 } |
1132 | 1132 |
1133 void ShelfLayoutManager::OnLockStateEvent(LockStateObserver::EventType event) { | 1133 void ShelfLayoutManager::OnLockStateEvent(LockStateObserver::EventType event) { |
1134 if (event == EVENT_LOCK_ANIMATION_STARTED) { | 1134 if (event == EVENT_LOCK_ANIMATION_STARTED) { |
1135 // Enter the screen locked state and update the visibility to avoid an odd | 1135 // Enter the screen locked state and update the visibility to avoid an odd |
1136 // animation when transitioning the orientation from L/R to bottom. | 1136 // animation when transitioning the orientation from L/R to bottom. |
(...skipping 37 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1174 return false; | 1174 return false; |
1175 } | 1175 } |
1176 if (session_state_delegate->IsUserSessionBlocked() || | 1176 if (session_state_delegate->IsUserSessionBlocked() || |
1177 state_.is_adding_user_screen) { | 1177 state_.is_adding_user_screen) { |
1178 return true; | 1178 return true; |
1179 } | 1179 } |
1180 return false; | 1180 return false; |
1181 } | 1181 } |
1182 | 1182 |
1183 } // namespace ash | 1183 } // namespace ash |
OLD | NEW |