The palette should block shelf autohide when it is open.

BUG=616112 Review-Url: https://codereview.chromium.org/2257363003 Cr-Commit-Position: refs/heads/master@{#413928}
qweri0p · Aug 24, 2016 · d98076e · d98076e
1 parent ea253f5
commit d98076e
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 0 deletions.
diff --git a/ash/common/system/chromeos/palette/palette_tray.cc b/ash/common/system/chromeos/palette/palette_tray.cc
@@ -269,6 +269,10 @@ void PaletteTray::HidePalette() {
   bubble_.reset();
 }
 
+bool PaletteTray::ShouldBlockShelfAutoHide() const {
+  return !!bubble_;
+}
+
 void PaletteTray::OnActiveToolChanged() {
   UpdateTrayIcon();
 }

diff --git a/ash/common/system/chromeos/palette/palette_tray.h b/ash/common/system/chromeos/palette/palette_tray.h
@@ -53,6 +53,9 @@ class ASH_EXPORT PaletteTray : public TrayBackgroundView,
   // PaletteToolManager::Delegate:
   void HidePalette() override;
 
+  // Returns true if the shelf should not autohide.
+  bool ShouldBlockShelfAutoHide() const;
+
  private:
   // views::TrayBubbleView::Delegate:
   void BubbleViewDestroyed() override;

diff --git a/ash/common/system/status_area_widget.cc b/ash/common/system/status_area_widget.cc
@@ -171,6 +171,11 @@ bool StatusAreaWidget::ShouldShowShelf() const {
        web_notification_tray_->ShouldBlockShelfAutoHide()))
     return true;
 
+#if defined(OS_CHROMEOS)
+  if (palette_tray_ && palette_tray_->ShouldBlockShelfAutoHide())
+    return true;
+#endif
+
   if (!wm_shelf_->IsVisible())
     return false;