| 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/system/status_area_widget_delegate.h" | 5 #include "ash/system/status_area_widget_delegate.h" |
| 6 | 6 |
| 7 #include "ash/common/focus_cycler.h" | 7 #include "ash/focus_cycler.h" |
| 8 #include "ash/common/shelf/shelf_constants.h" | |
| 9 #include "ash/common/shelf/wm_shelf.h" | |
| 10 #include "ash/common/shelf/wm_shelf_util.h" | |
| 11 #include "ash/common/wm_shell.h" | |
| 12 #include "ash/common/wm_window.h" | |
| 13 #include "ash/root_window_controller.h" | 8 #include "ash/root_window_controller.h" |
| 9 #include "ash/shelf/shelf_constants.h" |
| 10 #include "ash/shelf/wm_shelf.h" |
| 11 #include "ash/shelf/wm_shelf_util.h" |
| 14 #include "ash/system/tray/tray_constants.h" | 12 #include "ash/system/tray/tray_constants.h" |
| 13 #include "ash/wm_shell.h" |
| 14 #include "ash/wm_window.h" |
| 15 #include "ui/compositor/layer.h" | 15 #include "ui/compositor/layer.h" |
| 16 #include "ui/compositor/scoped_layer_animation_settings.h" | 16 #include "ui/compositor/scoped_layer_animation_settings.h" |
| 17 #include "ui/gfx/animation/tween.h" | 17 #include "ui/gfx/animation/tween.h" |
| 18 #include "ui/views/accessible_pane_view.h" | 18 #include "ui/views/accessible_pane_view.h" |
| 19 #include "ui/views/border.h" | 19 #include "ui/views/border.h" |
| 20 #include "ui/views/layout/grid_layout.h" | 20 #include "ui/views/layout/grid_layout.h" |
| 21 | 21 |
| 22 namespace { | 22 namespace { |
| 23 | 23 |
| 24 constexpr int kAnimationDurationMs = 250; | 24 constexpr int kAnimationDurationMs = 250; |
| (...skipping 165 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 190 child->SetBorder( | 190 child->SetBorder( |
| 191 views::CreateEmptyBorder(top_edge, left_edge, bottom_edge, right_edge)); | 191 views::CreateEmptyBorder(top_edge, left_edge, bottom_edge, right_edge)); |
| 192 | 192 |
| 193 // Layout on |child| needs to be updated based on new border value before | 193 // Layout on |child| needs to be updated based on new border value before |
| 194 // displaying; otherwise |child| will be showing with old border size. | 194 // displaying; otherwise |child| will be showing with old border size. |
| 195 // Fix for crbug.com/623438. | 195 // Fix for crbug.com/623438. |
| 196 child->Layout(); | 196 child->Layout(); |
| 197 } | 197 } |
| 198 | 198 |
| 199 } // namespace ash | 199 } // namespace ash |
| OLD | NEW |