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

Unified Diff: ash/common/system/status_area_widget.cc

Issue 2420393002: Block shelf auto hidden when opt-in IME menu is shown. (Closed)
Patch Set: Block shelf auto hide. 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 | « ash/common/system/chromeos/ime_menu/ime_menu_tray.cc ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/common/system/status_area_widget.cc
diff --git a/ash/common/system/status_area_widget.cc b/ash/common/system/status_area_widget.cc
index f9b41edbe1e24430e49b800b50c7fa85ac6d4f01..a415a98c4ff86d20b380ea82fd0ece6131cba32d 100644
--- a/ash/common/system/status_area_widget.cc
+++ b/ash/common/system/status_area_widget.cc
@@ -176,6 +176,9 @@ bool StatusAreaWidget::ShouldShowShelf() const {
#if defined(OS_CHROMEOS)
if (palette_tray_ && palette_tray_->ShouldBlockShelfAutoHide())
return true;
+
+ if (ime_menu_tray_ && ime_menu_tray_->ShouldBlockShelfAutoHide())
+ return true;
#endif
if (!wm_shelf_->IsVisible())
« no previous file with comments | « ash/common/system/chromeos/ime_menu/ime_menu_tray.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698