| Index: ui/keyboard/keyboard_controller.h
|
| diff --git a/ui/keyboard/keyboard_controller.h b/ui/keyboard/keyboard_controller.h
|
| index 0541165b33e83e0a5b3f4abeaea1a6ecec4cca30..d62306263cf4e3bba3d2c4faeee7bdbc1ef2ae30 100644
|
| --- a/ui/keyboard/keyboard_controller.h
|
| +++ b/ui/keyboard/keyboard_controller.h
|
| @@ -76,8 +76,9 @@ class KEYBOARD_EXPORT KeyboardController : public ui::InputMethodObserver,
|
|
|
| void set_lock_keyboard(bool lock) { lock_keyboard_ = lock; }
|
|
|
| - // Force the keyboard to show up if not showing and lock the keyboard.
|
| - void ShowAndLockKeyboard();
|
| + // Force the keyboard to show up if not showing and lock the keyboard if
|
| + // |lock| is true.
|
| + void ShowKeyboard(bool lock);
|
|
|
| // Sets the active keyboard controller. KeyboardController takes ownership of
|
| // the instance. Calling ResetIntance with a new instance destroys the
|
| @@ -118,7 +119,7 @@ class KEYBOARD_EXPORT KeyboardController : public ui::InputMethodObserver,
|
| virtual void OnShowImeIfNeeded() OVERRIDE;
|
|
|
| // Show virtual keyboard immediately with animation.
|
| - void ShowKeyboard();
|
| + void ShowKeyboardInternal();
|
|
|
| // Returns true if keyboard is scheduled to hide.
|
| bool WillHideKeyboard() const;
|
|
|