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 <algorithm> | 5 #include <algorithm> |
6 #include <vector> | 6 #include <vector> |
7 | 7 |
8 #include "ash/launcher/launcher.h" | 8 #include "ash/launcher/launcher.h" |
9 #include "ash/shell.h" | 9 #include "ash/shell.h" |
10 #include "ash/test/ash_test_base.h" | 10 #include "ash/test/ash_test_base.h" |
11 #include "ash/wm/shadow.h" | |
12 #include "ash/wm/shadow_controller.h" | |
13 #include "ash/wm/shadow_types.h" | |
14 #include "ash/wm/window_properties.h" | 11 #include "ash/wm/window_properties.h" |
15 #include "ash/wm/window_util.h" | 12 #include "ash/wm/window_util.h" |
16 #include "base/memory/scoped_ptr.h" | 13 #include "base/memory/scoped_ptr.h" |
17 #include "ui/aura/client/activation_client.h" | 14 #include "ui/aura/client/activation_client.h" |
18 #include "ui/aura/root_window.h" | 15 #include "ui/aura/root_window.h" |
19 #include "ui/aura/window.h" | 16 #include "ui/aura/window.h" |
20 #include "ui/compositor/layer.h" | 17 #include "ui/compositor/layer.h" |
21 #include "ui/gfx/display.h" | 18 #include "ui/gfx/display.h" |
22 #include "ui/gfx/insets.h" | 19 #include "ui/gfx/insets.h" |
23 #include "ui/gfx/screen.h" | 20 #include "ui/gfx/screen.h" |
| 21 #include "ui/views/corewm/shadow.h" |
| 22 #include "ui/views/corewm/shadow_controller.h" |
| 23 #include "ui/views/corewm/shadow_types.h" |
24 #include "ui/views/widget/widget.h" | 24 #include "ui/views/widget/widget.h" |
25 | 25 |
26 namespace ash { | 26 namespace ash { |
27 | 27 |
28 typedef ash::test::AshTestBase DIPTest; | 28 typedef ash::test::AshTestBase DIPTest; |
29 | 29 |
30 #if defined(OS_WIN) | 30 #if defined(OS_WIN) |
31 // Windows/Aura doesn't have DIP support in display yet. | 31 // Windows/Aura doesn't have DIP support in display yet. |
32 #define MAYBE_WorkArea DISABLED_WorkArea | 32 #define MAYBE_WorkArea DISABLED_WorkArea |
33 #else | 33 #else |
(...skipping 29 matching lines...) Expand all Loading... |
63 | 63 |
64 // Sanity check if the workarea's inset hight is same as | 64 // Sanity check if the workarea's inset hight is same as |
65 // the launcher's height. | 65 // the launcher's height. |
66 Launcher* launcher = Launcher::ForPrimaryDisplay(); | 66 Launcher* launcher = Launcher::ForPrimaryDisplay(); |
67 EXPECT_EQ( | 67 EXPECT_EQ( |
68 display_2x.bounds().InsetsFrom(work_area).height(), | 68 display_2x.bounds().InsetsFrom(work_area).height(), |
69 launcher->widget()->GetNativeView()->layer()->bounds().height()); | 69 launcher->widget()->GetNativeView()->layer()->bounds().height()); |
70 } | 70 } |
71 | 71 |
72 } // namespace ash | 72 } // namespace ash |
OLD | NEW |