OLD | NEW |
1 // Copyright 2014 The Chromium Authors. All rights reserved. | 1 // Copyright 2014 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/web_notification/ash_popup_alignment_delegate.h" | 5 #include "ash/common/system/web_notification/ash_popup_alignment_delegate.h" |
6 | 6 |
7 #include <utility> | 7 #include <utility> |
8 #include <vector> | 8 #include <vector> |
9 | 9 |
10 #include "ash/common/shelf/wm_shelf.h" | 10 #include "ash/common/shelf/wm_shelf.h" |
11 #include "ash/common/shell_window_ids.h" | |
12 #include "ash/common/wm_lookup.h" | 11 #include "ash/common/wm_lookup.h" |
13 #include "ash/common/wm_root_window_controller.h" | 12 #include "ash/common/wm_root_window_controller.h" |
14 #include "ash/common/wm_window.h" | 13 #include "ash/common/wm_window.h" |
15 #include "ash/display/display_manager.h" | 14 #include "ash/display/display_manager.h" |
16 #include "ash/public/cpp/shelf_types.h" | 15 #include "ash/public/cpp/shelf_types.h" |
| 16 #include "ash/public/cpp/shell_window_ids.h" |
17 #include "ash/shell.h" | 17 #include "ash/shell.h" |
18 #include "ash/test/ash_test_base.h" | 18 #include "ash/test/ash_test_base.h" |
19 #include "base/command_line.h" | 19 #include "base/command_line.h" |
20 #include "base/memory/ptr_util.h" | 20 #include "base/memory/ptr_util.h" |
21 #include "ui/display/screen.h" | 21 #include "ui/display/screen.h" |
22 #include "ui/gfx/geometry/rect.h" | 22 #include "ui/gfx/geometry/rect.h" |
23 #include "ui/keyboard/keyboard_switches.h" | 23 #include "ui/keyboard/keyboard_switches.h" |
24 #include "ui/keyboard/keyboard_util.h" | 24 #include "ui/keyboard/keyboard_util.h" |
25 #include "ui/message_center/message_center_style.h" | 25 #include "ui/message_center/message_center_style.h" |
26 | 26 |
(...skipping 277 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
304 shelf->SetVirtualKeyboardBoundsForTesting(keyboard_bounds); | 304 shelf->SetVirtualKeyboardBoundsForTesting(keyboard_bounds); |
305 int keyboard_baseline = alignment_delegate()->GetBaseLine(); | 305 int keyboard_baseline = alignment_delegate()->GetBaseLine(); |
306 EXPECT_NE(baseline, keyboard_baseline); | 306 EXPECT_NE(baseline, keyboard_baseline); |
307 EXPECT_GT(keyboard_bounds.y(), keyboard_baseline); | 307 EXPECT_GT(keyboard_bounds.y(), keyboard_baseline); |
308 | 308 |
309 shelf->SetVirtualKeyboardBoundsForTesting(gfx::Rect()); | 309 shelf->SetVirtualKeyboardBoundsForTesting(gfx::Rect()); |
310 EXPECT_EQ(baseline, alignment_delegate()->GetBaseLine()); | 310 EXPECT_EQ(baseline, alignment_delegate()->GetBaseLine()); |
311 } | 311 } |
312 | 312 |
313 } // namespace ash | 313 } // namespace ash |
OLD | NEW |