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/ash_switches.h" | 8 #include "ash/common/ash_switches.h" |
9 #include "ash/display/display_manager.h" | 9 #include "ash/display/display_manager.h" |
10 #include "ash/shelf/shelf.h" | 10 #include "ash/shelf/shelf.h" |
11 #include "ash/shelf/shelf_widget.h" | 11 #include "ash/shelf/shelf_widget.h" |
12 #include "ash/shell.h" | 12 #include "ash/shell.h" |
13 #include "ash/test/ash_test_base.h" | 13 #include "ash/test/ash_test_base.h" |
14 #include "ash/wm/window_properties.h" | 14 #include "ash/wm/window_properties.h" |
15 #include "ash/wm/window_util.h" | 15 #include "ash/wm/window_util.h" |
16 #include "base/command_line.h" | 16 #include "base/command_line.h" |
17 #include "ui/aura/window.h" | 17 #include "ui/aura/window.h" |
18 #include "ui/aura/window_event_dispatcher.h" | 18 #include "ui/aura/window_event_dispatcher.h" |
(...skipping 49 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
68 | 68 |
69 // Sanity check if the workarea's inset hight is same as | 69 // Sanity check if the workarea's inset hight is same as |
70 // the shelf's height. | 70 // the shelf's height. |
71 Shelf* shelf = Shelf::ForPrimaryDisplay(); | 71 Shelf* shelf = Shelf::ForPrimaryDisplay(); |
72 EXPECT_EQ( | 72 EXPECT_EQ( |
73 display_2x.bounds().InsetsFrom(work_area).height(), | 73 display_2x.bounds().InsetsFrom(work_area).height(), |
74 shelf->shelf_widget()->GetNativeView()->layer()->bounds().height()); | 74 shelf->shelf_widget()->GetNativeView()->layer()->bounds().height()); |
75 } | 75 } |
76 | 76 |
77 } // namespace ash | 77 } // namespace ash |
OLD | NEW |