| OLD | NEW |
| 1 // Copyright 2016 The Chromium Authors. All rights reserved. | 1 // Copyright 2016 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #ifndef ASH_AURA_WM_SHELF_AURA_H_ | 5 #ifndef ASH_AURA_WM_SHELF_AURA_H_ |
| 6 #define ASH_AURA_WM_SHELF_AURA_H_ | 6 #define ASH_AURA_WM_SHELF_AURA_H_ |
| 7 | 7 |
| 8 #include "ash/ash_export.h" | 8 #include "ash/ash_export.h" |
| 9 #include "ash/common/shelf/wm_shelf.h" | 9 #include "ash/common/shelf/wm_shelf.h" |
| 10 #include "ash/shelf/shelf_icon_observer.h" | 10 #include "ash/shelf/shelf_icon_observer.h" |
| 11 #include "ash/shelf/shelf_layout_manager_observer.h" | 11 #include "ash/shelf/shelf_layout_manager_observer.h" |
| 12 #include "ash/wm/gestures/shelf_gesture_handler.h" | |
| 13 #include "base/macros.h" | 12 #include "base/macros.h" |
| 14 #include "base/observer_list.h" | 13 #include "base/observer_list.h" |
| 15 | 14 |
| 16 namespace ash { | 15 namespace ash { |
| 17 | 16 |
| 18 class Shelf; | 17 class Shelf; |
| 19 class ShelfLayoutManager; | 18 class ShelfLayoutManager; |
| 20 | 19 |
| 21 // Aura implementation of WmShelf. | 20 // Aura implementation of WmShelf. |
| 22 class ASH_EXPORT WmShelfAura : public WmShelf, | 21 class ASH_EXPORT WmShelfAura : public WmShelf, |
| (...skipping 27 matching lines...) Expand all Loading... |
| 50 bool IsDimmed() const override; | 49 bool IsDimmed() const override; |
| 51 bool IsShowingOverflowBubble() const override; | 50 bool IsShowingOverflowBubble() const override; |
| 52 void SchedulePaint() override; | 51 void SchedulePaint() override; |
| 53 bool IsVisible() const override; | 52 bool IsVisible() const override; |
| 54 void UpdateVisibilityState() override; | 53 void UpdateVisibilityState() override; |
| 55 ShelfVisibilityState GetVisibilityState() const override; | 54 ShelfVisibilityState GetVisibilityState() const override; |
| 56 gfx::Rect GetIdealBounds() override; | 55 gfx::Rect GetIdealBounds() override; |
| 57 gfx::Rect GetUserWorkAreaBounds() const override; | 56 gfx::Rect GetUserWorkAreaBounds() const override; |
| 58 void UpdateIconPositionForWindow(WmWindow* window) override; | 57 void UpdateIconPositionForWindow(WmWindow* window) override; |
| 59 gfx::Rect GetScreenBoundsOfItemIconForWindow(WmWindow* window) override; | 58 gfx::Rect GetScreenBoundsOfItemIconForWindow(WmWindow* window) override; |
| 60 bool ProcessGestureEvent(const ui::GestureEvent& event, | 59 bool ProcessGestureEvent(const ui::GestureEvent& event) override; |
| 61 WmWindow* target_window) override; | |
| 62 void UpdateAutoHideForMouseEvent(ui::MouseEvent* event) override; | 60 void UpdateAutoHideForMouseEvent(ui::MouseEvent* event) override; |
| 63 void UpdateAutoHideForGestureEvent(ui::GestureEvent* event) override; | 61 void UpdateAutoHideForGestureEvent(ui::GestureEvent* event) override; |
| 64 void AddObserver(WmShelfObserver* observer) override; | 62 void AddObserver(WmShelfObserver* observer) override; |
| 65 void RemoveObserver(WmShelfObserver* observer) override; | 63 void RemoveObserver(WmShelfObserver* observer) override; |
| 66 void SetKeyboardBoundsForTesting(const gfx::Rect& bounds) override; | 64 void SetKeyboardBoundsForTesting(const gfx::Rect& bounds) override; |
| 67 ShelfLockingManager* GetShelfLockingManagerForTesting() override; | 65 ShelfLockingManager* GetShelfLockingManagerForTesting() override; |
| 68 ShelfView* GetShelfViewForTesting() override; | 66 ShelfView* GetShelfViewForTesting() override; |
| 69 | 67 |
| 70 // ShelfLayoutManagerObserver: | 68 // ShelfLayoutManagerObserver: |
| 71 void WillDeleteShelfLayoutManager() override; | 69 void WillDeleteShelfLayoutManager() override; |
| 72 void OnAutoHideStateChanged(ShelfAutoHideState new_state) override; | 70 void OnAutoHideStateChanged(ShelfAutoHideState new_state) override; |
| 73 void OnBackgroundUpdated(ShelfBackgroundType background_type, | 71 void OnBackgroundUpdated(ShelfBackgroundType background_type, |
| 74 BackgroundAnimatorChangeType change_type) override; | 72 BackgroundAnimatorChangeType change_type) override; |
| 75 void WillChangeVisibilityState(ShelfVisibilityState new_state) override; | 73 void WillChangeVisibilityState(ShelfVisibilityState new_state) override; |
| 76 | 74 |
| 77 // ShelfIconObserver: | 75 // ShelfIconObserver: |
| 78 void OnShelfIconPositionsChanged() override; | 76 void OnShelfIconPositionsChanged() override; |
| 79 | 77 |
| 80 // May be null during login and during initialization of a secondary display. | 78 // May be null during login and during initialization of a secondary display. |
| 81 Shelf* shelf_ = nullptr; | 79 Shelf* shelf_ = nullptr; |
| 82 | 80 |
| 83 // Cached separately because it may be destroyed before |shelf_|. | 81 // Cached separately because it may be destroyed before |shelf_|. |
| 84 ShelfLayoutManager* shelf_layout_manager_ = nullptr; | 82 ShelfLayoutManager* shelf_layout_manager_ = nullptr; |
| 85 | 83 |
| 86 // Handler for swipe and drag gestures. | |
| 87 ShelfGestureHandler gesture_handler_; | |
| 88 | |
| 89 base::ObserverList<WmShelfObserver> observers_; | 84 base::ObserverList<WmShelfObserver> observers_; |
| 90 | 85 |
| 91 DISALLOW_COPY_AND_ASSIGN(WmShelfAura); | 86 DISALLOW_COPY_AND_ASSIGN(WmShelfAura); |
| 92 }; | 87 }; |
| 93 | 88 |
| 94 } // namespace ash | 89 } // namespace ash |
| 95 | 90 |
| 96 #endif // ASH_AURA_WM_SHELF_AURA_H_ | 91 #endif // ASH_AURA_WM_SHELF_AURA_H_ |
| OLD | NEW |