| 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> |
| 11 #include <vector> | 11 #include <vector> |
| 12 | 12 |
| 13 #include "ash/accelerators/accelerator_commands.h" | 13 #include "ash/accelerators/accelerator_commands.h" |
| 14 #include "ash/ash_switches.h" | 14 #include "ash/ash_switches.h" |
| 15 #include "ash/common/shell_window_ids.h" |
| 15 #include "ash/common/wm/shelf/wm_shelf_util.h" | 16 #include "ash/common/wm/shelf/wm_shelf_util.h" |
| 16 #include "ash/common/wm/window_state.h" | 17 #include "ash/common/wm/window_state.h" |
| 17 #include "ash/common/wm/wm_root_window_controller.h" | 18 #include "ash/common/wm/wm_root_window_controller.h" |
| 18 #include "ash/common/wm/wm_root_window_controller_observer.h" | 19 #include "ash/common/wm/wm_root_window_controller_observer.h" |
| 19 #include "ash/root_window_controller.h" | 20 #include "ash/root_window_controller.h" |
| 20 #include "ash/screen_util.h" | 21 #include "ash/screen_util.h" |
| 21 #include "ash/session/session_state_delegate.h" | 22 #include "ash/session/session_state_delegate.h" |
| 22 #include "ash/shelf/shelf.h" | 23 #include "ash/shelf/shelf.h" |
| 23 #include "ash/shelf/shelf_bezel_event_filter.h" | 24 #include "ash/shelf/shelf_bezel_event_filter.h" |
| 24 #include "ash/shelf/shelf_constants.h" | 25 #include "ash/shelf/shelf_constants.h" |
| 25 #include "ash/shelf/shelf_delegate.h" | 26 #include "ash/shelf/shelf_delegate.h" |
| 26 #include "ash/shelf/shelf_layout_manager_observer.h" | 27 #include "ash/shelf/shelf_layout_manager_observer.h" |
| 27 #include "ash/shelf/shelf_util.h" | 28 #include "ash/shelf/shelf_util.h" |
| 28 #include "ash/shelf/shelf_widget.h" | 29 #include "ash/shelf/shelf_widget.h" |
| 29 #include "ash/shell.h" | 30 #include "ash/shell.h" |
| 30 #include "ash/shell_window_ids.h" | |
| 31 #include "ash/system/status_area_widget.h" | 31 #include "ash/system/status_area_widget.h" |
| 32 #include "ash/wm/aura/wm_window_aura.h" | 32 #include "ash/wm/aura/wm_window_aura.h" |
| 33 #include "ash/wm/gestures/shelf_gesture_handler.h" | 33 #include "ash/wm/gestures/shelf_gesture_handler.h" |
| 34 #include "ash/wm/lock_state_controller.h" | 34 #include "ash/wm/lock_state_controller.h" |
| 35 #include "ash/wm/mru_window_tracker.h" | 35 #include "ash/wm/mru_window_tracker.h" |
| 36 #include "ash/wm/window_animations.h" | 36 #include "ash/wm/window_animations.h" |
| 37 #include "ash/wm/window_state_aura.h" | 37 #include "ash/wm/window_state_aura.h" |
| 38 #include "ash/wm/window_util.h" | 38 #include "ash/wm/window_util.h" |
| 39 #include "ash/wm/workspace_controller.h" | 39 #include "ash/wm/workspace_controller.h" |
| 40 #include "base/auto_reset.h" | 40 #include "base/auto_reset.h" |
| (...skipping 1147 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1188 UpdateBoundsAndOpacity(target_bounds, true, NULL); | 1188 UpdateBoundsAndOpacity(target_bounds, true, NULL); |
| 1189 UpdateVisibilityState(); | 1189 UpdateVisibilityState(); |
| 1190 } | 1190 } |
| 1191 | 1191 |
| 1192 void ShelfLayoutManager::UpdateShelfVisibilityAfterLoginUIChange() { | 1192 void ShelfLayoutManager::UpdateShelfVisibilityAfterLoginUIChange() { |
| 1193 UpdateVisibilityState(); | 1193 UpdateVisibilityState(); |
| 1194 LayoutShelf(); | 1194 LayoutShelf(); |
| 1195 } | 1195 } |
| 1196 | 1196 |
| 1197 } // namespace ash | 1197 } // namespace ash |
| OLD | NEW |