| 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" |
| (...skipping 26 matching lines...) Expand all Loading... |
| 37 private: | 37 private: |
| 38 void ResetShelfLayoutManager(); | 38 void ResetShelfLayoutManager(); |
| 39 | 39 |
| 40 // WmShelf: | 40 // WmShelf: |
| 41 WmWindow* GetWindow() override; | 41 WmWindow* GetWindow() override; |
| 42 ShelfAlignment GetAlignment() const override; | 42 ShelfAlignment GetAlignment() const override; |
| 43 void SetAlignment(ShelfAlignment alignment) override; | 43 void SetAlignment(ShelfAlignment alignment) override; |
| 44 ShelfAutoHideBehavior GetAutoHideBehavior() const override; | 44 ShelfAutoHideBehavior GetAutoHideBehavior() const override; |
| 45 void SetAutoHideBehavior(ShelfAutoHideBehavior behavior) override; | 45 void SetAutoHideBehavior(ShelfAutoHideBehavior behavior) override; |
| 46 ShelfAutoHideState GetAutoHideState() const override; | 46 ShelfAutoHideState GetAutoHideState() const override; |
| 47 void UpdateAutoHideState() override; |
| 47 ShelfBackgroundType GetBackgroundType() const override; | 48 ShelfBackgroundType GetBackgroundType() const override; |
| 49 bool IsDimmed() const override; |
| 50 bool IsVisible() const override; |
| 48 void UpdateVisibilityState() override; | 51 void UpdateVisibilityState() override; |
| 49 ShelfVisibilityState GetVisibilityState() const override; | 52 ShelfVisibilityState GetVisibilityState() const override; |
| 53 gfx::Rect GetIdealBounds() override; |
| 50 gfx::Rect GetUserWorkAreaBounds() const override; | 54 gfx::Rect GetUserWorkAreaBounds() const override; |
| 51 void UpdateIconPositionForWindow(WmWindow* window) override; | 55 void UpdateIconPositionForWindow(WmWindow* window) override; |
| 52 gfx::Rect GetScreenBoundsOfItemIconForWindow(WmWindow* window) override; | 56 gfx::Rect GetScreenBoundsOfItemIconForWindow(WmWindow* window) override; |
| 57 void UpdateAutoHideForMouseEvent(ui::MouseEvent* event) override; |
| 58 void UpdateAutoHideForGestureEvent(ui::GestureEvent* event) override; |
| 53 void AddObserver(WmShelfObserver* observer) override; | 59 void AddObserver(WmShelfObserver* observer) override; |
| 54 void RemoveObserver(WmShelfObserver* observer) override; | 60 void RemoveObserver(WmShelfObserver* observer) override; |
| 55 | 61 |
| 56 // ShelfLayoutManagerObserver: | 62 // ShelfLayoutManagerObserver: |
| 57 void WillDeleteShelfLayoutManager() override; | 63 void WillDeleteShelfLayoutManager() override; |
| 58 void OnAutoHideStateChanged(ShelfAutoHideState new_state) override; | 64 void OnAutoHideStateChanged(ShelfAutoHideState new_state) override; |
| 59 void OnBackgroundUpdated(ShelfBackgroundType background_type, | 65 void OnBackgroundUpdated(ShelfBackgroundType background_type, |
| 60 BackgroundAnimatorChangeType change_type) override; | 66 BackgroundAnimatorChangeType change_type) override; |
| 61 void WillChangeVisibilityState(ShelfVisibilityState new_state) override; | 67 void WillChangeVisibilityState(ShelfVisibilityState new_state) override; |
| 62 | 68 |
| 63 // ShelfIconObserver: | 69 // ShelfIconObserver: |
| 64 void OnShelfIconPositionsChanged() override; | 70 void OnShelfIconPositionsChanged() override; |
| 65 | 71 |
| 66 // May be null during login and during initialization of a secondary display. | 72 // May be null during login and during initialization of a secondary display. |
| 67 Shelf* shelf_ = nullptr; | 73 Shelf* shelf_ = nullptr; |
| 68 | 74 |
| 69 // Cached separately because it may be destroyed before |shelf_|. | 75 // Cached separately because it may be destroyed before |shelf_|. |
| 70 ShelfLayoutManager* shelf_layout_manager_ = nullptr; | 76 ShelfLayoutManager* shelf_layout_manager_ = nullptr; |
| 71 | 77 |
| 72 base::ObserverList<WmShelfObserver> observers_; | 78 base::ObserverList<WmShelfObserver> observers_; |
| 73 | 79 |
| 74 DISALLOW_COPY_AND_ASSIGN(WmShelfAura); | 80 DISALLOW_COPY_AND_ASSIGN(WmShelfAura); |
| 75 }; | 81 }; |
| 76 | 82 |
| 77 } // namespace ash | 83 } // namespace ash |
| 78 | 84 |
| 79 #endif // ASH_AURA_WM_SHELF_AURA_H_ | 85 #endif // ASH_AURA_WM_SHELF_AURA_H_ |
| OLD | NEW |