| 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/common/shelf/shelf_layout_manager.h" |
| 6 | 6 |
| 7 #include <algorithm> | 7 #include <algorithm> |
| 8 #include <cmath> | 8 #include <cmath> |
| 9 #include <vector> | 9 #include <vector> |
| 10 | 10 |
| 11 #include "ash/common/material_design/material_design_controller.h" | 11 #include "ash/common/material_design/material_design_controller.h" |
| 12 #include "ash/common/session/session_state_delegate.h" | 12 #include "ash/common/session/session_state_delegate.h" |
| 13 #include "ash/common/shelf/shelf.h" |
| 13 #include "ash/common/shelf/shelf_constants.h" | 14 #include "ash/common/shelf/shelf_constants.h" |
| 14 #include "ash/common/shelf/shelf_delegate.h" | 15 #include "ash/common/shelf/shelf_delegate.h" |
| 16 #include "ash/common/shelf/shelf_layout_manager_observer.h" |
| 15 #include "ash/common/shelf/wm_shelf_util.h" | 17 #include "ash/common/shelf/wm_shelf_util.h" |
| 16 #include "ash/common/shell_window_ids.h" | 18 #include "ash/common/shell_window_ids.h" |
| 17 #include "ash/common/system/status_area_widget.h" | 19 #include "ash/common/system/status_area_widget.h" |
| 18 #include "ash/common/wm/fullscreen_window_finder.h" | 20 #include "ash/common/wm/fullscreen_window_finder.h" |
| 19 #include "ash/common/wm/mru_window_tracker.h" | 21 #include "ash/common/wm/mru_window_tracker.h" |
| 20 #include "ash/common/wm/window_state.h" | 22 #include "ash/common/wm/window_state.h" |
| 21 #include "ash/common/wm/wm_screen_util.h" | 23 #include "ash/common/wm/wm_screen_util.h" |
| 22 #include "ash/common/wm_lookup.h" | 24 #include "ash/common/wm_lookup.h" |
| 23 #include "ash/common/wm_root_window_controller.h" | 25 #include "ash/common/wm_root_window_controller.h" |
| 24 #include "ash/common/wm_root_window_controller_observer.h" | 26 #include "ash/common/wm_root_window_controller_observer.h" |
| 25 #include "ash/common/wm_shell.h" | 27 #include "ash/common/wm_shell.h" |
| 26 #include "ash/common/wm_window.h" | 28 #include "ash/common/wm_window.h" |
| 27 #include "ash/shelf/shelf.h" | |
| 28 #include "ash/shelf/shelf_layout_manager_observer.h" | |
| 29 #include "base/auto_reset.h" | 29 #include "base/auto_reset.h" |
| 30 #include "base/command_line.h" | 30 #include "base/command_line.h" |
| 31 #include "base/i18n/rtl.h" | 31 #include "base/i18n/rtl.h" |
| 32 #include "ui/base/ui_base_switches.h" | 32 #include "ui/base/ui_base_switches.h" |
| 33 #include "ui/compositor/layer.h" | 33 #include "ui/compositor/layer.h" |
| 34 #include "ui/compositor/layer_animation_observer.h" | 34 #include "ui/compositor/layer_animation_observer.h" |
| 35 #include "ui/compositor/layer_animator.h" | 35 #include "ui/compositor/layer_animator.h" |
| 36 #include "ui/compositor/scoped_layer_animation_settings.h" | 36 #include "ui/compositor/scoped_layer_animation_settings.h" |
| 37 #include "ui/display/display.h" | 37 #include "ui/display/display.h" |
| 38 #include "ui/display/screen.h" | 38 #include "ui/display/screen.h" |
| (...skipping 1137 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1176 gesture_drag_status_ = GESTURE_DRAG_NONE; | 1176 gesture_drag_status_ = GESTURE_DRAG_NONE; |
| 1177 } | 1177 } |
| 1178 | 1178 |
| 1179 int ShelfLayoutManager::GetShelfInsetsForAutoHide() const { | 1179 int ShelfLayoutManager::GetShelfInsetsForAutoHide() const { |
| 1180 if (invisible_auto_hide_shelf_) | 1180 if (invisible_auto_hide_shelf_) |
| 1181 return 0; | 1181 return 0; |
| 1182 return GetShelfConstant(SHELF_INSETS_FOR_AUTO_HIDE); | 1182 return GetShelfConstant(SHELF_INSETS_FOR_AUTO_HIDE); |
| 1183 } | 1183 } |
| 1184 | 1184 |
| 1185 } // namespace ash | 1185 } // namespace ash |
| OLD | NEW |