| Index: ash/system/ime_menu/ime_menu_tray.cc
|
| diff --git a/ash/system/ime_menu/ime_menu_tray.cc b/ash/system/ime_menu/ime_menu_tray.cc
|
| index e160dbff5c36e770343276775b8a854d1438fae7..a0f8b56d7b4cd8718b6b0db9c63f6fbabcff0c07 100644
|
| --- a/ash/system/ime_menu/ime_menu_tray.cc
|
| +++ b/ash/system/ime_menu/ime_menu_tray.cc
|
| @@ -287,7 +287,6 @@ ImeMenuTray::ImeMenuTray(WmShelf* wm_shelf)
|
| label_(new ImeMenuLabel()),
|
| show_keyboard_(false),
|
| force_show_keyboard_(false),
|
| - should_block_shelf_auto_hide_(false),
|
| keyboard_suppressed_(false),
|
| show_bubble_after_keyboard_hidden_(false) {
|
| SetInkDropMode(InkDropMode::ON);
|
| @@ -325,7 +324,6 @@ void ImeMenuTray::ShowImeMenuBubble() {
|
| }
|
|
|
| void ImeMenuTray::ShowImeMenuBubbleInternal() {
|
| - should_block_shelf_auto_hide_ = true;
|
| views::TrayBubbleView::InitParams init_params(
|
| GetAnchorAlignment(), kTrayMenuMinimumWidth, kTrayMenuMinimumWidth);
|
| init_params.can_activate = true;
|
| @@ -356,7 +354,6 @@ void ImeMenuTray::HideImeMenuBubble() {
|
| bubble_.reset();
|
| ime_list_view_ = nullptr;
|
| SetIsActive(false);
|
| - should_block_shelf_auto_hide_ = false;
|
| shelf()->UpdateAutoHideState();
|
| }
|
|
|
| @@ -405,10 +402,6 @@ void ImeMenuTray::ShowKeyboardWithKeyset(const std::string& keyset) {
|
| }
|
| }
|
|
|
| -bool ImeMenuTray::ShouldBlockShelfAutoHide() const {
|
| - return should_block_shelf_auto_hide_;
|
| -}
|
| -
|
| bool ImeMenuTray::ShouldShowEmojiHandwritingVoiceButtons() const {
|
| // Emoji, handwriting and voice input is not supported for these cases:
|
| // 1) features::kEHVInputOnImeMenu is not enabled.
|
|
|