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 "ui/keyboard/keyboard_layout_manager.h" | 5 #include "ui/keyboard/keyboard_layout_manager.h" |
6 | 6 |
7 #include "ui/compositor/layer_animator.h" | 7 #include "ui/compositor/layer_animator.h" |
8 #include "ui/display/display.h" | 8 #include "ui/display/display.h" |
9 #include "ui/display/screen.h" | 9 #include "ui/display/screen.h" |
10 #include "ui/keyboard/keyboard_controller.h" | 10 #include "ui/keyboard/keyboard_controller.h" |
(...skipping 81 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
92 .id(); | 92 .id(); |
93 controller_->ShowKeyboardInDisplay(display_id); | 93 controller_->ShowKeyboardInDisplay(display_id); |
94 } else { | 94 } else { |
95 controller_->ShowKeyboard(false /* lock */); | 95 controller_->ShowKeyboard(false /* lock */); |
96 } | 96 } |
97 } else { | 97 } else { |
98 if (controller_->keyboard_mode() == FULL_WIDTH) { | 98 if (controller_->keyboard_mode() == FULL_WIDTH) { |
99 // We need to send out this notification only if keyboard is visible since | 99 // We need to send out this notification only if keyboard is visible since |
100 // keyboard window is resized even if keyboard is hidden. | 100 // keyboard window is resized even if keyboard is hidden. |
101 if (controller_->keyboard_visible()) | 101 if (controller_->keyboard_visible()) |
102 controller_->NotifyKeyboardBoundsChanging(requested_bounds); | 102 controller_->NotifyKeyboardBoundsChanging(new_bounds); |
103 } else if (controller_->keyboard_mode() == FLOATING) { | 103 } else if (controller_->keyboard_mode() == FLOATING) { |
104 controller_->NotifyKeyboardBoundsChanging(gfx::Rect()); | 104 controller_->NotifyKeyboardBoundsChanging(gfx::Rect()); |
105 } | 105 } |
106 } | 106 } |
107 } | 107 } |
108 | 108 |
109 } // namespace keyboard | 109 } // namespace keyboard |
OLD | NEW |