OLD | NEW |
1 // Copyright (c) 2013 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2013 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 "ui/keyboard/keyboard_controller.h" | 5 #include "ui/keyboard/keyboard_controller.h" |
6 | 6 |
7 #include "base/bind.h" | 7 #include "base/bind.h" |
8 #include "base/command_line.h" | 8 #include "base/command_line.h" |
| 9 #include "base/macros.h" |
9 #include "base/memory/scoped_ptr.h" | 10 #include "base/memory/scoped_ptr.h" |
10 #include "base/message_loop/message_loop.h" | 11 #include "base/message_loop/message_loop.h" |
11 #include "testing/gtest/include/gtest/gtest.h" | 12 #include "testing/gtest/include/gtest/gtest.h" |
12 #include "ui/aura/client/focus_client.h" | 13 #include "ui/aura/client/focus_client.h" |
13 #include "ui/aura/layout_manager.h" | 14 #include "ui/aura/layout_manager.h" |
14 #include "ui/aura/test/aura_test_helper.h" | 15 #include "ui/aura/test/aura_test_helper.h" |
15 #include "ui/aura/test/test_window_delegate.h" | 16 #include "ui/aura/test/test_window_delegate.h" |
16 #include "ui/aura/window.h" | 17 #include "ui/aura/window.h" |
17 #include "ui/aura/window_event_dispatcher.h" | 18 #include "ui/aura/window_event_dispatcher.h" |
18 #include "ui/base/ime/dummy_text_input_client.h" | 19 #include "ui/base/ime/dummy_text_input_client.h" |
(...skipping 587 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
606 // Before hide animation finishes, show keyboard again. | 607 // Before hide animation finishes, show keyboard again. |
607 ShowKeyboard(); | 608 ShowKeyboard(); |
608 RunAnimationForLayer(layer); | 609 RunAnimationForLayer(layer); |
609 EXPECT_TRUE(keyboard_container()->IsVisible()); | 610 EXPECT_TRUE(keyboard_container()->IsVisible()); |
610 EXPECT_TRUE(keyboard_window()->IsVisible()); | 611 EXPECT_TRUE(keyboard_window()->IsVisible()); |
611 EXPECT_EQ(1.0, layer->opacity()); | 612 EXPECT_EQ(1.0, layer->opacity()); |
612 EXPECT_EQ(gfx::Transform(), layer->transform()); | 613 EXPECT_EQ(gfx::Transform(), layer->transform()); |
613 } | 614 } |
614 | 615 |
615 } // namespace keyboard | 616 } // namespace keyboard |
OLD | NEW |