| 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" |
| (...skipping 491 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 502 // Notify observers after animation finished to prevent reveal desktop | 502 // Notify observers after animation finished to prevent reveal desktop |
| 503 // background during animation. | 503 // background during animation. |
| 504 NotifyKeyboardBoundsChanging(container_->bounds()); | 504 NotifyKeyboardBoundsChanging(container_->bounds()); |
| 505 ui_->EnsureCaretInWorkArea(); | 505 ui_->EnsureCaretInWorkArea(); |
| 506 } | 506 } |
| 507 | 507 |
| 508 void KeyboardController::HideAnimationFinished() { | 508 void KeyboardController::HideAnimationFinished() { |
| 509 ui_->HideKeyboardContainer(container_.get()); | 509 ui_->HideKeyboardContainer(container_.get()); |
| 510 for (KeyboardControllerObserver& observer : observer_list_) | 510 for (KeyboardControllerObserver& observer : observer_list_) |
| 511 observer.OnKeyboardHidden(); | 511 observer.OnKeyboardHidden(); |
| 512 ui_->EnsureCaretInWorkArea(); |
| 512 } | 513 } |
| 513 | 514 |
| 514 void KeyboardController::AdjustKeyboardBounds() { | 515 void KeyboardController::AdjustKeyboardBounds() { |
| 515 // When keyboard is floating, no resize is necessary. | 516 // When keyboard is floating, no resize is necessary. |
| 516 if (keyboard_mode_ == FLOATING) | 517 if (keyboard_mode_ == FLOATING) |
| 517 return; | 518 return; |
| 518 | 519 |
| 519 if (keyboard_mode_ == FULL_WIDTH) { | 520 if (keyboard_mode_ == FULL_WIDTH) { |
| 520 // TODO(bshe): revisit this logic after we decide to support resize virtual | 521 // TODO(bshe): revisit this logic after we decide to support resize virtual |
| 521 // keyboard. | 522 // keyboard. |
| 522 int keyboard_height = GetContainerWindow()->bounds().height(); | 523 int keyboard_height = GetContainerWindow()->bounds().height(); |
| 523 const gfx::Rect& root_bounds = container_->GetRootWindow()->bounds(); | 524 const gfx::Rect& root_bounds = container_->GetRootWindow()->bounds(); |
| 524 gfx::Rect new_bounds = root_bounds; | 525 gfx::Rect new_bounds = root_bounds; |
| 525 new_bounds.set_y(root_bounds.height() - keyboard_height); | 526 new_bounds.set_y(root_bounds.height() - keyboard_height); |
| 526 new_bounds.set_height(keyboard_height); | 527 new_bounds.set_height(keyboard_height); |
| 527 GetContainerWindow()->SetBounds(new_bounds); | 528 GetContainerWindow()->SetBounds(new_bounds); |
| 528 } | 529 } |
| 529 } | 530 } |
| 530 | 531 |
| 531 } // namespace keyboard | 532 } // namespace keyboard |
| OLD | NEW |