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/system/web_notification/ash_popup_alignment_delegate.h" | 5 #include "ash/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/shell_window_ids.h" |
10 #include "ash/display/display_manager.h" | 11 #include "ash/display/display_manager.h" |
11 #include "ash/display/window_tree_host_manager.h" | 12 #include "ash/display/window_tree_host_manager.h" |
12 #include "ash/screen_util.h" | 13 #include "ash/screen_util.h" |
13 #include "ash/shelf/shelf.h" | 14 #include "ash/shelf/shelf.h" |
14 #include "ash/shelf/shelf_layout_manager.h" | 15 #include "ash/shelf/shelf_layout_manager.h" |
15 #include "ash/shelf/shelf_types.h" | 16 #include "ash/shelf/shelf_types.h" |
16 #include "ash/shell.h" | 17 #include "ash/shell.h" |
17 #include "ash/shell_window_ids.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 |
27 namespace ash { | 27 namespace ash { |
(...skipping 291 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
319 SetKeyboardBounds(keyboard_bounds); | 319 SetKeyboardBounds(keyboard_bounds); |
320 int keyboard_baseline = alignment_delegate()->GetBaseLine(); | 320 int keyboard_baseline = alignment_delegate()->GetBaseLine(); |
321 EXPECT_NE(baseline, keyboard_baseline); | 321 EXPECT_NE(baseline, keyboard_baseline); |
322 EXPECT_GT(keyboard_bounds.y(), keyboard_baseline); | 322 EXPECT_GT(keyboard_bounds.y(), keyboard_baseline); |
323 | 323 |
324 SetKeyboardBounds(gfx::Rect()); | 324 SetKeyboardBounds(gfx::Rect()); |
325 EXPECT_EQ(baseline, alignment_delegate()->GetBaseLine()); | 325 EXPECT_EQ(baseline, alignment_delegate()->GetBaseLine()); |
326 } | 326 } |
327 | 327 |
328 } // namespace ash | 328 } // namespace ash |
OLD | NEW |