mash: Break ash system tray dependencies on ash::ShelfWidget

ash/aura/wm_shelf_aura.cc

 // Copyright 2016 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "ash/aura/wm_shelf_aura.h"
 
 #include "ash/aura/wm_window_aura.h"
 #include "ash/common/shelf/wm_shelf_observer.h"
 #include "ash/common/wm_window.h"
 #include "ash/shelf/shelf.h"
 #include "ash/shelf/shelf_layout_manager.h"
+#include "ash/shell.h"
 #include "ui/views/widget/widget.h"
 
 namespace ash {
 
 WmShelfAura::WmShelfAura() {}
 
 WmShelfAura::~WmShelfAura() {}
 
 void WmShelfAura::SetShelfLayoutManager(
     ShelfLayoutManager* shelf_layout_manager) {
@@ skipping 50 matching lines @@
 }
 
 void WmShelfAura::SetAutoHideBehavior(ShelfAutoHideBehavior behavior) {
   shelf_->SetAutoHideBehavior(behavior);
 }
 
 ShelfAutoHideState WmShelfAura::GetAutoHideState() const {
   return shelf_layout_manager_->auto_hide_state();
 }
 
+void WmShelfAura::UpdateAutoHideState() {
+  shelf_layout_manager_->UpdateAutoHideState();
+}
+
 ShelfBackgroundType WmShelfAura::GetBackgroundType() const {
   return shelf_layout_manager_->shelf_widget()->GetBackgroundType();
 }
 
+bool WmShelfAura::IsDimmed() const {
+  return shelf_layout_manager_->shelf_widget()->GetDimsShelf();
+}
+
+bool WmShelfAura::IsVisible() const {
+  return shelf_->IsVisible();
+}
+
 void WmShelfAura::UpdateVisibilityState() {
   shelf_layout_manager_->UpdateVisibilityState();
 }
 
 ShelfVisibilityState WmShelfAura::GetVisibilityState() const {
   return shelf_layout_manager_ ? shelf_layout_manager_->visibility_state()
                                : SHELF_HIDDEN;
 }
 
+gfx::Rect WmShelfAura::GetIdealBounds() {
+  return shelf_layout_manager_->GetIdealBounds();
+}
+
 gfx::Rect WmShelfAura::GetUserWorkAreaBounds() const {
   return shelf_layout_manager_ ? shelf_layout_manager_->user_work_area_bounds()
                                : gfx::Rect();
 }
 
 void WmShelfAura::UpdateIconPositionForWindow(WmWindow* window) {
   shelf_->UpdateIconPositionForWindow(WmWindowAura::GetAuraWindow(window));
 }
 
 gfx::Rect WmShelfAura::GetScreenBoundsOfItemIconForWindow(WmWindow* window) {
   return shelf_->GetScreenBoundsOfItemIconForWindow(
       WmWindowAura::GetAuraWindow(window));
 }
 
+void WmShelfAura::UpdateAutoHideForMouseEvent(ui::MouseEvent* event) {
+  // Auto-hide support for ash_sysui.
+  if (Shell::GetInstance()->in_mus() && shelf_layout_manager_)
+    shelf_layout_manager_->UpdateAutoHideForMouseEvent(event);
+}
+
+void WmShelfAura::UpdateAutoHideForGestureEvent(ui::GestureEvent* event) {
+  // Auto-hide support for ash_sysui.
+  if (Shell::GetInstance()->in_mus() && shelf_layout_manager_)
+    shelf_layout_manager_->UpdateAutoHideForGestureEvent(event);
+}
+
 void WmShelfAura::AddObserver(WmShelfObserver* observer) {
   observers_.AddObserver(observer);
 }
 
 void WmShelfAura::RemoveObserver(WmShelfObserver* observer) {
   observers_.RemoveObserver(observer);
 }
 
 void WmShelfAura::WillDeleteShelfLayoutManager() {
   ResetShelfLayoutManager();
@@ skipping 14 matching lines @@
 void WmShelfAura::OnAutoHideStateChanged(ShelfAutoHideState new_state) {
   FOR_EACH_OBSERVER(WmShelfObserver, observers_,
                     OnAutoHideStateChanged(new_state));
 }
 
 void WmShelfAura::OnShelfIconPositionsChanged() {
   FOR_EACH_OBSERVER(WmShelfObserver, observers_, OnShelfIconPositionsChanged());
 }
 
 }  // namespace ash