Chromium Code Reviews| 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/common/system/status_area_widget_delegate.h" | 5 #include "ash/common/system/status_area_widget_delegate.h" |
| 6 | 6 |
| 7 #include "ash/ash_export.h" | 7 #include "ash/ash_export.h" |
| 8 #include "ash/common/ash_switches.h" | 8 #include "ash/common/ash_switches.h" |
| 9 #include "ash/common/focus_cycler.h" | 9 #include "ash/common/focus_cycler.h" |
| 10 #include "ash/common/material_design/material_design_controller.h" | 10 #include "ash/common/material_design/material_design_controller.h" |
| 11 #include "ash/common/shelf/shelf_constants.h" | 11 #include "ash/common/shelf/shelf_constants.h" |
| 12 #include "ash/common/shelf/wm_shelf.h" | 12 #include "ash/common/shelf/wm_shelf.h" |
| 13 #include "ash/common/shelf/wm_shelf_util.h" | 13 #include "ash/common/shelf/wm_shelf_util.h" |
| 14 #include "ash/common/shell_window_ids.h" | 14 #include "ash/common/shell_window_ids.h" |
| 15 #include "ash/common/system/tray/tray_background_view.h" | |
|
varkha
2016/07/14 21:34:47
Do you still need this?
yiyix
2016/07/26 20:27:31
Done.
| |
| 15 #include "ash/common/system/tray/tray_constants.h" | 16 #include "ash/common/system/tray/tray_constants.h" |
| 16 #include "ash/common/wm_lookup.h" | 17 #include "ash/common/wm_lookup.h" |
| 17 #include "ash/common/wm_root_window_controller.h" | 18 #include "ash/common/wm_root_window_controller.h" |
| 18 #include "ash/common/wm_shell.h" | 19 #include "ash/common/wm_shell.h" |
| 19 #include "ash/common/wm_window.h" | 20 #include "ash/common/wm_window.h" |
| 20 #include "base/strings/utf_string_conversions.h" | 21 #include "base/strings/utf_string_conversions.h" |
| 21 #include "ui/compositor/layer.h" | 22 #include "ui/compositor/layer.h" |
| 22 #include "ui/compositor/scoped_layer_animation_settings.h" | 23 #include "ui/compositor/scoped_layer_animation_settings.h" |
| 23 #include "ui/gfx/animation/tween.h" | 24 #include "ui/gfx/animation/tween.h" |
| 24 #include "ui/gfx/canvas.h" | 25 #include "ui/gfx/canvas.h" |
| (...skipping 206 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 231 } | 232 } |
| 232 child->SetBorder(views::Border::CreateEmptyBorder(top_edge, left_edge, | 233 child->SetBorder(views::Border::CreateEmptyBorder(top_edge, left_edge, |
| 233 bottom_edge, right_edge)); | 234 bottom_edge, right_edge)); |
| 234 // Layout on |child| needs to be updated based on new border value before | 235 // Layout on |child| needs to be updated based on new border value before |
| 235 // displaying; otherwise |child| will be showing with old border size. | 236 // displaying; otherwise |child| will be showing with old border size. |
| 236 // Fix for crbug.com/623438. | 237 // Fix for crbug.com/623438. |
| 237 child->Layout(); | 238 child->Layout(); |
| 238 } | 239 } |
| 239 | 240 |
| 240 } // namespace ash | 241 } // namespace ash |
| OLD | NEW |