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

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

Issue 2432163006: Show/Hide the shelf when showing/hiding IME menu. (Closed)
Patch Set: Created 4 years, 2 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 | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/common/system/chromeos/ime_menu/ime_menu_tray.cc
diff --git a/ash/common/system/chromeos/ime_menu/ime_menu_tray.cc b/ash/common/system/chromeos/ime_menu/ime_menu_tray.cc
index 81b3c7abe2921d8460257bfa0e662148b4a9a03b..92423349d3f77378cda459cd1a10ffb70d3008b1 100644
--- a/ash/common/system/chromeos/ime_menu/ime_menu_tray.cc
+++ b/ash/common/system/chromeos/ime_menu/ime_menu_tray.cc
@@ -293,6 +293,7 @@ ImeMenuTray::~ImeMenuTray() {
}
void ImeMenuTray::ShowImeMenuBubble() {
+ should_block_shelf_auto_hide_ = true;
views::TrayBubbleView::InitParams init_params(
views::TrayBubbleView::ANCHOR_TYPE_TRAY, GetAnchorAlignment(),
kTrayPopupMinWidth, kTrayPopupMaxWidth);
@@ -353,7 +354,6 @@ void ImeMenuTray::ShowImeMenuBubble() {
bubble_.reset(new TrayBubbleWrapper(this, bubble_view));
SetDrawBackgroundAsActive(true);
- should_block_shelf_auto_hide_ = true;
}
void ImeMenuTray::HideImeMenuBubble() {
@@ -361,6 +361,7 @@ void ImeMenuTray::HideImeMenuBubble() {
ime_list_view_ = nullptr;
SetDrawBackgroundAsActive(false);
should_block_shelf_auto_hide_ = false;
+ shelf()->UpdateAutoHideState();
}
bool ImeMenuTray::IsImeMenuBubbleShown() {
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698