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/tray/tray_background_view.h" | 5 #include "ash/common/system/tray/tray_background_view.h" |
6 | 6 |
7 #include "ash/common/material_design/material_design_controller.h" | 7 #include "ash/common/material_design/material_design_controller.h" |
8 #include "ash/common/shelf/shelf_constants.h" | 8 #include "ash/common/shelf/shelf_constants.h" |
9 #include "ash/common/shelf/wm_shelf.h" | 9 #include "ash/common/shelf/wm_shelf.h" |
10 #include "ash/common/shelf/wm_shelf_util.h" | 10 #include "ash/common/shelf/wm_shelf_util.h" |
11 #include "ash/common/shell_window_ids.h" | |
12 #include "ash/common/system/status_area_widget.h" | 11 #include "ash/common/system/status_area_widget.h" |
13 #include "ash/common/system/tray/system_tray.h" | 12 #include "ash/common/system/tray/system_tray.h" |
14 #include "ash/common/system/tray/tray_constants.h" | 13 #include "ash/common/system/tray/tray_constants.h" |
15 #include "ash/common/system/tray/tray_event_filter.h" | 14 #include "ash/common/system/tray/tray_event_filter.h" |
16 #include "ash/common/wm_lookup.h" | 15 #include "ash/common/wm_lookup.h" |
17 #include "ash/common/wm_shell.h" | 16 #include "ash/common/wm_shell.h" |
18 #include "ash/common/wm_window.h" | 17 #include "ash/common/wm_window.h" |
| 18 #include "ash/public/cpp/shell_window_ids.h" |
19 #include "grit/ash_resources.h" | 19 #include "grit/ash_resources.h" |
20 #include "ui/accessibility/ax_view_state.h" | 20 #include "ui/accessibility/ax_view_state.h" |
21 #include "ui/base/nine_image_painter_factory.h" | 21 #include "ui/base/nine_image_painter_factory.h" |
22 #include "ui/compositor/layer.h" | 22 #include "ui/compositor/layer.h" |
23 #include "ui/compositor/layer_animation_element.h" | 23 #include "ui/compositor/layer_animation_element.h" |
24 #include "ui/compositor/scoped_layer_animation_settings.h" | 24 #include "ui/compositor/scoped_layer_animation_settings.h" |
25 #include "ui/events/event_constants.h" | 25 #include "ui/events/event_constants.h" |
26 #include "ui/gfx/animation/tween.h" | 26 #include "ui/gfx/animation/tween.h" |
27 #include "ui/gfx/canvas.h" | 27 #include "ui/gfx/canvas.h" |
28 #include "ui/gfx/geometry/rect.h" | 28 #include "ui/gfx/geometry/rect.h" |
(...skipping 542 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
571 paint.setAntiAlias(true); | 571 paint.setAntiAlias(true); |
572 | 572 |
573 const gfx::Rect bounds = horizontal_shelf ? gfx::Rect(x, y, width, height) | 573 const gfx::Rect bounds = horizontal_shelf ? gfx::Rect(x, y, width, height) |
574 : gfx::Rect(y, x, height, width); | 574 : gfx::Rect(y, x, height, width); |
575 gfx::RectF rect(gfx::ScaleRect(gfx::RectF(bounds), scale)); | 575 gfx::RectF rect(gfx::ScaleRect(gfx::RectF(bounds), scale)); |
576 canvas->DrawLine(horizontal_shelf ? rect.top_right() : rect.bottom_left(), | 576 canvas->DrawLine(horizontal_shelf ? rect.top_right() : rect.bottom_left(), |
577 rect.bottom_right(), paint); | 577 rect.bottom_right(), paint); |
578 } | 578 } |
579 | 579 |
580 } // namespace ash | 580 } // namespace ash |
OLD | NEW |