| 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/tray/tray_background_view.h" | 5 #include "ash/system/tray/tray_background_view.h" |
| 6 | 6 |
| 7 #include <algorithm> | 7 #include <algorithm> |
| 8 | 8 |
| 9 #include "ash/ash_constants.h" | 9 #include "ash/common/ash_constants.h" |
| 10 #include "ash/material_design/material_design_controller.h" | 10 #include "ash/common/material_design/material_design_controller.h" |
| 11 #include "ash/common/wm_shell.h" |
| 12 #include "ash/common/wm_window.h" |
| 11 #include "ash/public/cpp/shell_window_ids.h" | 13 #include "ash/public/cpp/shell_window_ids.h" |
| 12 #include "ash/resources/grit/ash_resources.h" | 14 #include "ash/resources/grit/ash_resources.h" |
| 13 #include "ash/shelf/shelf_constants.h" | 15 #include "ash/shelf/shelf_constants.h" |
| 14 #include "ash/shelf/wm_shelf.h" | 16 #include "ash/shelf/wm_shelf.h" |
| 15 #include "ash/shelf/wm_shelf_util.h" | 17 #include "ash/shelf/wm_shelf_util.h" |
| 16 #include "ash/system/tray/system_tray.h" | 18 #include "ash/system/tray/system_tray.h" |
| 17 #include "ash/system/tray/tray_constants.h" | 19 #include "ash/system/tray/tray_constants.h" |
| 18 #include "ash/system/tray/tray_event_filter.h" | 20 #include "ash/system/tray/tray_event_filter.h" |
| 19 #include "ash/wm_shell.h" | |
| 20 #include "ash/wm_window.h" | |
| 21 #include "base/memory/ptr_util.h" | 21 #include "base/memory/ptr_util.h" |
| 22 #include "ui/accessibility/ax_node_data.h" | 22 #include "ui/accessibility/ax_node_data.h" |
| 23 #include "ui/base/nine_image_painter_factory.h" | 23 #include "ui/base/nine_image_painter_factory.h" |
| 24 #include "ui/compositor/layer.h" | 24 #include "ui/compositor/layer.h" |
| 25 #include "ui/compositor/layer_animation_element.h" | 25 #include "ui/compositor/layer_animation_element.h" |
| 26 #include "ui/compositor/scoped_layer_animation_settings.h" | 26 #include "ui/compositor/scoped_layer_animation_settings.h" |
| 27 #include "ui/events/event_constants.h" | 27 #include "ui/events/event_constants.h" |
| 28 #include "ui/gfx/animation/tween.h" | 28 #include "ui/gfx/animation/tween.h" |
| 29 #include "ui/gfx/canvas.h" | 29 #include "ui/gfx/canvas.h" |
| 30 #include "ui/gfx/geometry/rect.h" | 30 #include "ui/gfx/geometry/rect.h" |
| (...skipping 582 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 613 } | 613 } |
| 614 | 614 |
| 615 gfx::Rect TrayBackgroundView::GetBackgroundBounds() const { | 615 gfx::Rect TrayBackgroundView::GetBackgroundBounds() const { |
| 616 gfx::Insets insets = GetBackgroundInsets(); | 616 gfx::Insets insets = GetBackgroundInsets(); |
| 617 gfx::Rect bounds = GetLocalBounds(); | 617 gfx::Rect bounds = GetLocalBounds(); |
| 618 bounds.Inset(insets); | 618 bounds.Inset(insets); |
| 619 return bounds; | 619 return bounds; |
| 620 } | 620 } |
| 621 | 621 |
| 622 } // namespace ash | 622 } // namespace ash |
| OLD | NEW |
|---|
Chromium Code Reviews
Issue 2734733002:
Revert "chromeos: Move files in //ash/common to //ash, part 3" (Closed)
