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 <set> | 7 #include <set> |
8 | 8 |
9 #include "base/bind.h" | 9 #include "base/bind.h" |
10 #include "base/command_line.h" | 10 #include "base/command_line.h" |
| 11 #include "base/macros.h" |
| 12 #include "build/build_config.h" |
11 #include "ui/aura/window.h" | 13 #include "ui/aura/window.h" |
12 #include "ui/aura/window_delegate.h" | 14 #include "ui/aura/window_delegate.h" |
13 #include "ui/aura/window_observer.h" | 15 #include "ui/aura/window_observer.h" |
14 #include "ui/base/cursor/cursor.h" | 16 #include "ui/base/cursor/cursor.h" |
15 #include "ui/base/hit_test.h" | 17 #include "ui/base/hit_test.h" |
16 #include "ui/base/ime/input_method.h" | 18 #include "ui/base/ime/input_method.h" |
17 #include "ui/base/ime/text_input_client.h" | 19 #include "ui/base/ime/text_input_client.h" |
18 #include "ui/compositor/layer_animation_observer.h" | 20 #include "ui/compositor/layer_animation_observer.h" |
19 #include "ui/compositor/scoped_layer_animation_settings.h" | 21 #include "ui/compositor/scoped_layer_animation_settings.h" |
20 #include "ui/gfx/geometry/rect.h" | 22 #include "ui/gfx/geometry/rect.h" |
(...skipping 455 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
476 // background during animation. | 478 // background during animation. |
477 NotifyKeyboardBoundsChanging(container_->bounds()); | 479 NotifyKeyboardBoundsChanging(container_->bounds()); |
478 ui_->EnsureCaretInWorkArea(); | 480 ui_->EnsureCaretInWorkArea(); |
479 } | 481 } |
480 | 482 |
481 void KeyboardController::HideAnimationFinished() { | 483 void KeyboardController::HideAnimationFinished() { |
482 ui_->HideKeyboardContainer(container_.get()); | 484 ui_->HideKeyboardContainer(container_.get()); |
483 } | 485 } |
484 | 486 |
485 } // namespace keyboard | 487 } // namespace keyboard |
OLD | NEW |