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/aura/wm_window_aura.h" | 14 #include "ash/aura/wm_window_aura.h" |
15 #include "ash/common/ash_switches.h" | 15 #include "ash/common/ash_switches.h" |
16 #include "ash/common/material_design/material_design_controller.h" | 16 #include "ash/common/material_design/material_design_controller.h" |
17 #include "ash/common/session/session_state_delegate.h" | 17 #include "ash/common/session/session_state_delegate.h" |
18 #include "ash/common/shelf/shelf_constants.h" | 18 #include "ash/common/shelf/shelf_constants.h" |
19 #include "ash/common/shelf/wm_shelf_util.h" | 19 #include "ash/common/shelf/wm_shelf_util.h" |
20 #include "ash/common/shell_window_ids.h" | 20 #include "ash/common/shell_window_ids.h" |
| 21 #include "ash/common/system/status_area_widget.h" |
21 #include "ash/common/wm/mru_window_tracker.h" | 22 #include "ash/common/wm/mru_window_tracker.h" |
22 #include "ash/common/wm/window_state.h" | 23 #include "ash/common/wm/window_state.h" |
23 #include "ash/common/wm_root_window_controller.h" | 24 #include "ash/common/wm_root_window_controller.h" |
24 #include "ash/common/wm_root_window_controller_observer.h" | 25 #include "ash/common/wm_root_window_controller_observer.h" |
25 #include "ash/common/wm_shell.h" | 26 #include "ash/common/wm_shell.h" |
26 #include "ash/root_window_controller.h" | 27 #include "ash/root_window_controller.h" |
27 #include "ash/screen_util.h" | 28 #include "ash/screen_util.h" |
28 #include "ash/shelf/shelf.h" | 29 #include "ash/shelf/shelf.h" |
29 #include "ash/shelf/shelf_bezel_event_filter.h" | 30 #include "ash/shelf/shelf_bezel_event_filter.h" |
30 #include "ash/shelf/shelf_delegate.h" | 31 #include "ash/shelf/shelf_delegate.h" |
31 #include "ash/shelf/shelf_layout_manager_observer.h" | 32 #include "ash/shelf/shelf_layout_manager_observer.h" |
32 #include "ash/shelf/shelf_util.h" | 33 #include "ash/shelf/shelf_util.h" |
33 #include "ash/shelf/shelf_widget.h" | 34 #include "ash/shelf/shelf_widget.h" |
34 #include "ash/shell.h" | 35 #include "ash/shell.h" |
35 #include "ash/system/status_area_widget.h" | |
36 #include "ash/wm/gestures/shelf_gesture_handler.h" | 36 #include "ash/wm/gestures/shelf_gesture_handler.h" |
37 #include "ash/wm/lock_state_controller.h" | 37 #include "ash/wm/lock_state_controller.h" |
38 #include "ash/wm/window_animations.h" | 38 #include "ash/wm/window_animations.h" |
39 #include "ash/wm/window_state_aura.h" | 39 #include "ash/wm/window_state_aura.h" |
40 #include "ash/wm/window_util.h" | 40 #include "ash/wm/window_util.h" |
41 #include "ash/wm/workspace_controller.h" | 41 #include "ash/wm/workspace_controller.h" |
42 #include "base/auto_reset.h" | 42 #include "base/auto_reset.h" |
43 #include "base/command_line.h" | 43 #include "base/command_line.h" |
44 #include "base/i18n/rtl.h" | 44 #include "base/i18n/rtl.h" |
45 #include "base/strings/string_number_conversions.h" | 45 #include "base/strings/string_number_conversions.h" |
(...skipping 1161 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1207 if (ash::MaterialDesignController::IsShelfMaterial()) { | 1207 if (ash::MaterialDesignController::IsShelfMaterial()) { |
1208 return (state.visibility_state == SHELF_AUTO_HIDE && | 1208 return (state.visibility_state == SHELF_AUTO_HIDE && |
1209 state.auto_hide_state == SHELF_AUTO_HIDE_SHOWN) | 1209 state.auto_hide_state == SHELF_AUTO_HIDE_SHOWN) |
1210 ? 1.0f | 1210 ? 1.0f |
1211 : 0.0f; | 1211 : 0.0f; |
1212 } | 1212 } |
1213 return (state.visibility_state == SHELF_AUTO_HIDE) ? 1.0f : 0.0f; | 1213 return (state.visibility_state == SHELF_AUTO_HIDE) ? 1.0f : 0.0f; |
1214 } | 1214 } |
1215 | 1215 |
1216 } // namespace ash | 1216 } // namespace ash |
OLD | NEW |