| 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" | |
| 14 #include "ash/aura/wm_window_aura.h" | 13 #include "ash/aura/wm_window_aura.h" |
| 14 #include "ash/common/accelerators/accelerator_commands.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/system/status_area_widget.h" |
| 22 #include "ash/common/wm/mru_window_tracker.h" | 22 #include "ash/common/wm/mru_window_tracker.h" |
| 23 #include "ash/common/wm/window_state.h" | 23 #include "ash/common/wm/window_state.h" |
| 24 #include "ash/common/wm_root_window_controller.h" | 24 #include "ash/common/wm_root_window_controller.h" |
| (...skipping 1180 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1205 if (ash::MaterialDesignController::IsShelfMaterial()) { | 1205 if (ash::MaterialDesignController::IsShelfMaterial()) { |
| 1206 return (state.visibility_state == SHELF_AUTO_HIDE && | 1206 return (state.visibility_state == SHELF_AUTO_HIDE && |
| 1207 state.auto_hide_state == SHELF_AUTO_HIDE_SHOWN) | 1207 state.auto_hide_state == SHELF_AUTO_HIDE_SHOWN) |
| 1208 ? 1.0f | 1208 ? 1.0f |
| 1209 : 0.0f; | 1209 : 0.0f; |
| 1210 } | 1210 } |
| 1211 return (state.visibility_state == SHELF_AUTO_HIDE) ? 1.0f : 0.0f; | 1211 return (state.visibility_state == SHELF_AUTO_HIDE) ? 1.0f : 0.0f; |
| 1212 } | 1212 } |
| 1213 | 1213 |
| 1214 } // namespace ash | 1214 } // namespace ash |
| OLD | NEW |