| 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 "ui/aura/layout_manager.h" | 9 #include "ui/aura/layout_manager.h" |
| 10 #include "ui/aura/window.h" | 10 #include "ui/aura/window.h" |
| 11 #include "ui/aura/window_delegate.h" | 11 #include "ui/aura/window_delegate.h" |
| 12 #include "ui/base/cursor/cursor.h" | 12 #include "ui/base/cursor/cursor.h" |
| 13 #include "ui/base/hit_test.h" | 13 #include "ui/base/hit_test.h" |
| 14 #include "ui/base/ime/input_method.h" | 14 #include "ui/base/ime/input_method.h" |
| 15 #include "ui/base/ime/text_input_client.h" | 15 #include "ui/base/ime/text_input_client.h" |
| 16 #include "ui/base/ime/text_input_type.h" | 16 #include "ui/base/ime/text_input_type.h" |
| 17 #include "ui/compositor/layer_animation_observer.h" | 17 #include "ui/compositor/layer_animation_observer.h" |
| 18 #include "ui/compositor/scoped_layer_animation_settings.h" | 18 #include "ui/compositor/scoped_layer_animation_settings.h" |
| 19 #include "ui/gfx/path.h" | 19 #include "ui/gfx/path.h" |
| 20 #include "ui/gfx/rect.h" | 20 #include "ui/gfx/rect.h" |
| 21 #include "ui/gfx/skia_util.h" | 21 #include "ui/gfx/skia_util.h" |
| 22 #include "ui/keyboard/keyboard_controller_observer.h" | 22 #include "ui/keyboard/keyboard_controller_observer.h" |
| 23 #include "ui/keyboard/keyboard_controller_proxy.h" | 23 #include "ui/keyboard/keyboard_controller_proxy.h" |
| 24 #include "ui/keyboard/keyboard_switches.h" | 24 #include "ui/keyboard/keyboard_switches.h" |
| 25 #include "ui/keyboard/keyboard_util.h" | 25 #include "ui/keyboard/keyboard_util.h" |
| 26 #include "ui/wm/public/masked_window_targeter.h" | 26 #include "ui/wm/core/masked_window_targeter.h" |
| 27 | 27 |
| 28 #if defined(OS_CHROMEOS) | 28 #if defined(OS_CHROMEOS) |
| 29 #include "base/process/launch.h" | 29 #include "base/process/launch.h" |
| 30 #include "base/sys_info.h" | 30 #include "base/sys_info.h" |
| 31 #endif | 31 #endif |
| 32 | 32 |
| 33 namespace { | 33 namespace { |
| 34 | 34 |
| 35 const int kHideKeyboardDelayMs = 100; | 35 const int kHideKeyboardDelayMs = 100; |
| 36 | 36 |
| (...skipping 442 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 479 // background during animation. | 479 // background during animation. |
| 480 NotifyKeyboardBoundsChanging(proxy_->GetKeyboardWindow()->bounds()); | 480 NotifyKeyboardBoundsChanging(proxy_->GetKeyboardWindow()->bounds()); |
| 481 proxy_->EnsureCaretInWorkArea(); | 481 proxy_->EnsureCaretInWorkArea(); |
| 482 } | 482 } |
| 483 | 483 |
| 484 void KeyboardController::HideAnimationFinished() { | 484 void KeyboardController::HideAnimationFinished() { |
| 485 proxy_->HideKeyboardContainer(container_.get()); | 485 proxy_->HideKeyboardContainer(container_.get()); |
| 486 } | 486 } |
| 487 | 487 |
| 488 } // namespace keyboard | 488 } // namespace keyboard |
| OLD | NEW |