| 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 10 matching lines...) Expand all Loading... |
| 21 #include "ash/shelf/shelf_layout_manager_observer.h" | 21 #include "ash/shelf/shelf_layout_manager_observer.h" |
| 22 #include "ash/shelf/shelf_widget.h" | 22 #include "ash/shelf/shelf_widget.h" |
| 23 #include "ash/shell.h" | 23 #include "ash/shell.h" |
| 24 #include "ash/shell_window_ids.h" | 24 #include "ash/shell_window_ids.h" |
| 25 #include "ash/system/status_area_widget.h" | 25 #include "ash/system/status_area_widget.h" |
| 26 #include "ash/wm/gestures/shelf_gesture_handler.h" | 26 #include "ash/wm/gestures/shelf_gesture_handler.h" |
| 27 #include "ash/wm/lock_state_controller.h" | 27 #include "ash/wm/lock_state_controller.h" |
| 28 #include "ash/wm/mru_window_tracker.h" | 28 #include "ash/wm/mru_window_tracker.h" |
| 29 #include "ash/wm/window_animations.h" | 29 #include "ash/wm/window_animations.h" |
| 30 #include "ash/wm/window_state.h" | 30 #include "ash/wm/window_state.h" |
| 31 #include "ash/wm/window_state_aura.h" |
| 31 #include "ash/wm/window_util.h" | 32 #include "ash/wm/window_util.h" |
| 32 #include "ash/wm/workspace_controller.h" | 33 #include "ash/wm/workspace_controller.h" |
| 33 #include "base/auto_reset.h" | 34 #include "base/auto_reset.h" |
| 34 #include "base/command_line.h" | 35 #include "base/command_line.h" |
| 35 #include "base/command_line.h" | 36 #include "base/command_line.h" |
| 36 #include "base/i18n/rtl.h" | 37 #include "base/i18n/rtl.h" |
| 37 #include "base/strings/string_number_conversions.h" | 38 #include "base/strings/string_number_conversions.h" |
| 38 #include "base/strings/string_util.h" | 39 #include "base/strings/string_util.h" |
| 39 #include "ui/aura/client/cursor_client.h" | 40 #include "ui/aura/client/cursor_client.h" |
| 40 #include "ui/aura/mus/mus_util.h" | 41 #include "ui/aura/mus/mus_util.h" |
| (...skipping 1075 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1116 | 1117 |
| 1117 void ShelfLayoutManager::UpdateShelfVisibilityAfterLoginUIChange() { | 1118 void ShelfLayoutManager::UpdateShelfVisibilityAfterLoginUIChange() { |
| 1118 UpdateVisibilityState(); | 1119 UpdateVisibilityState(); |
| 1119 LayoutShelf(); | 1120 LayoutShelf(); |
| 1120 // The shelf alignment may have changed when it was unlocked. | 1121 // The shelf alignment may have changed when it was unlocked. |
| 1121 Shell::GetInstance()->OnShelfAlignmentChanged( | 1122 Shell::GetInstance()->OnShelfAlignmentChanged( |
| 1122 shelf_->GetNativeWindow()->GetRootWindow()); | 1123 shelf_->GetNativeWindow()->GetRootWindow()); |
| 1123 } | 1124 } |
| 1124 | 1125 |
| 1125 } // namespace ash | 1126 } // namespace ash |
| OLD | NEW |