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/focus_cycler.h" | 7 #include "ash/focus_cycler.h" |
8 #include "ash/root_window_controller.h" | 8 #include "ash/root_window_controller.h" |
9 #include "ash/session/session_controller.h" | 9 #include "ash/session/session_controller.h" |
10 #include "ash/shelf/shelf.h" | 10 #include "ash/shelf/shelf.h" |
11 #include "ash/shelf/shelf_constants.h" | 11 #include "ash/shelf/shelf_constants.h" |
12 #include "ash/shell.h" | 12 #include "ash/shell.h" |
13 #include "ash/system/status_area_widget.h" | 13 #include "ash/system/status_area_widget.h" |
14 #include "ash/system/tray/system_tray.h" | 14 #include "ash/system/tray/system_tray.h" |
15 #include "ash/system/tray/tray_constants.h" | 15 #include "ash/system/tray/tray_constants.h" |
16 #include "ash/wm_window.h" | |
17 #include "ui/compositor/layer.h" | 16 #include "ui/compositor/layer.h" |
18 #include "ui/compositor/scoped_layer_animation_settings.h" | 17 #include "ui/compositor/scoped_layer_animation_settings.h" |
19 #include "ui/gfx/animation/tween.h" | 18 #include "ui/gfx/animation/tween.h" |
20 #include "ui/views/accessible_pane_view.h" | 19 #include "ui/views/accessible_pane_view.h" |
21 #include "ui/views/border.h" | 20 #include "ui/views/border.h" |
22 #include "ui/views/layout/grid_layout.h" | 21 #include "ui/views/layout/grid_layout.h" |
23 | 22 |
24 namespace { | 23 namespace { |
25 | 24 |
26 using session_manager::SessionState; | 25 using session_manager::SessionState; |
(...skipping 189 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
216 child->SetBorder( | 215 child->SetBorder( |
217 views::CreateEmptyBorder(top_edge, left_edge, bottom_edge, right_edge)); | 216 views::CreateEmptyBorder(top_edge, left_edge, bottom_edge, right_edge)); |
218 | 217 |
219 // Layout on |child| needs to be updated based on new border value before | 218 // Layout on |child| needs to be updated based on new border value before |
220 // displaying; otherwise |child| will be showing with old border size. | 219 // displaying; otherwise |child| will be showing with old border size. |
221 // Fix for crbug.com/623438. | 220 // Fix for crbug.com/623438. |
222 child->Layout(); | 221 child->Layout(); |
223 } | 222 } |
224 | 223 |
225 } // namespace ash | 224 } // namespace ash |
OLD | NEW |