Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(2661)

Unified Diff: ash/system/ime_menu/ime_menu_tray.cc

Issue 2831233003: Remove ShouldBlockShelfAutoHide(). (Closed)
Patch Set: rename and rebase Created 3 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « ash/system/ime_menu/ime_menu_tray.h ('k') | ash/system/ime_menu/ime_menu_tray_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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.
« no previous file with comments | « ash/system/ime_menu/ime_menu_tray.h ('k') | ash/system/ime_menu/ime_menu_tray_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698