| 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/public/cpp/config.h" | 10 #include "ash/public/cpp/config.h" |
| 11 #include "ash/public/cpp/shelf_types.h" | 11 #include "ash/public/cpp/shelf_types.h" |
| 12 #include "ash/public/cpp/shell_window_ids.h" | 12 #include "ash/public/cpp/shell_window_ids.h" |
| 13 #include "ash/root_window_controller.h" | 13 #include "ash/root_window_controller.h" |
| 14 #include "ash/shelf/shelf.h" | 14 #include "ash/shelf/shelf.h" |
| 15 #include "ash/shell.h" | 15 #include "ash/shell.h" |
| 16 #include "ash/test/ash_test_base.h" | 16 #include "ash/test/ash_test_base.h" |
| 17 #include "ash/wm_window.h" | |
| 18 #include "base/command_line.h" | 17 #include "base/command_line.h" |
| 19 #include "base/memory/ptr_util.h" | 18 #include "base/memory/ptr_util.h" |
| 20 #include "ui/display/manager/display_manager.h" | 19 #include "ui/display/manager/display_manager.h" |
| 21 #include "ui/display/screen.h" | 20 #include "ui/display/screen.h" |
| 22 #include "ui/gfx/geometry/rect.h" | 21 #include "ui/gfx/geometry/rect.h" |
| 23 #include "ui/keyboard/keyboard_switches.h" | 22 #include "ui/keyboard/keyboard_switches.h" |
| 24 #include "ui/keyboard/keyboard_util.h" | 23 #include "ui/keyboard/keyboard_util.h" |
| 25 #include "ui/message_center/message_center_style.h" | 24 #include "ui/message_center/message_center_style.h" |
| 26 | 25 |
| 27 namespace ash { | 26 namespace ash { |
| (...skipping 225 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 253 shelf->SetVirtualKeyboardBoundsForTesting(keyboard_bounds); | 252 shelf->SetVirtualKeyboardBoundsForTesting(keyboard_bounds); |
| 254 int keyboard_baseline = alignment_delegate()->GetBaseLine(); | 253 int keyboard_baseline = alignment_delegate()->GetBaseLine(); |
| 255 EXPECT_NE(baseline, keyboard_baseline); | 254 EXPECT_NE(baseline, keyboard_baseline); |
| 256 EXPECT_GT(keyboard_bounds.y(), keyboard_baseline); | 255 EXPECT_GT(keyboard_bounds.y(), keyboard_baseline); |
| 257 | 256 |
| 258 shelf->SetVirtualKeyboardBoundsForTesting(gfx::Rect()); | 257 shelf->SetVirtualKeyboardBoundsForTesting(gfx::Rect()); |
| 259 EXPECT_EQ(baseline, alignment_delegate()->GetBaseLine()); | 258 EXPECT_EQ(baseline, alignment_delegate()->GetBaseLine()); |
| 260 } | 259 } |
| 261 | 260 |
| 262 } // namespace ash | 261 } // namespace ash |
| OLD | NEW |