| 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 47 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 58 void UpdateIconPositionForWindow(WmWindow* window) override; | 58 void UpdateIconPositionForWindow(WmWindow* window) override; |
| 59 gfx::Rect GetScreenBoundsOfItemIconForWindow(WmWindow* window) override; | 59 gfx::Rect GetScreenBoundsOfItemIconForWindow(WmWindow* window) override; |
| 60 bool ProcessGestureEvent(const ui::GestureEvent& event, | 60 bool ProcessGestureEvent(const ui::GestureEvent& event, |
| 61 WmWindow* target_window) override; | 61 WmWindow* target_window) override; |
| 62 void UpdateAutoHideForMouseEvent(ui::MouseEvent* event) override; | 62 void UpdateAutoHideForMouseEvent(ui::MouseEvent* event) override; |
| 63 void UpdateAutoHideForGestureEvent(ui::GestureEvent* event) override; | 63 void UpdateAutoHideForGestureEvent(ui::GestureEvent* event) override; |
| 64 void AddObserver(WmShelfObserver* observer) override; | 64 void AddObserver(WmShelfObserver* observer) override; |
| 65 void RemoveObserver(WmShelfObserver* observer) override; | 65 void RemoveObserver(WmShelfObserver* observer) override; |
| 66 void SetKeyboardBoundsForTesting(const gfx::Rect& bounds) override; | 66 void SetKeyboardBoundsForTesting(const gfx::Rect& bounds) override; |
| 67 ShelfLockingManager* GetShelfLockingManagerForTesting() override; | 67 ShelfLockingManager* GetShelfLockingManagerForTesting() override; |
| 68 ShelfView* GetShelfViewForTesting() override; |
| 68 | 69 |
| 69 // ShelfLayoutManagerObserver: | 70 // ShelfLayoutManagerObserver: |
| 70 void WillDeleteShelfLayoutManager() override; | 71 void WillDeleteShelfLayoutManager() override; |
| 71 void OnAutoHideStateChanged(ShelfAutoHideState new_state) override; | 72 void OnAutoHideStateChanged(ShelfAutoHideState new_state) override; |
| 72 void OnBackgroundUpdated(ShelfBackgroundType background_type, | 73 void OnBackgroundUpdated(ShelfBackgroundType background_type, |
| 73 BackgroundAnimatorChangeType change_type) override; | 74 BackgroundAnimatorChangeType change_type) override; |
| 74 void WillChangeVisibilityState(ShelfVisibilityState new_state) override; | 75 void WillChangeVisibilityState(ShelfVisibilityState new_state) override; |
| 75 | 76 |
| 76 // ShelfIconObserver: | 77 // ShelfIconObserver: |
| 77 void OnShelfIconPositionsChanged() override; | 78 void OnShelfIconPositionsChanged() override; |
| 78 | 79 |
| 79 // May be null during login and during initialization of a secondary display. | 80 // May be null during login and during initialization of a secondary display. |
| 80 Shelf* shelf_ = nullptr; | 81 Shelf* shelf_ = nullptr; |
| 81 | 82 |
| 82 // Cached separately because it may be destroyed before |shelf_|. | 83 // Cached separately because it may be destroyed before |shelf_|. |
| 83 ShelfLayoutManager* shelf_layout_manager_ = nullptr; | 84 ShelfLayoutManager* shelf_layout_manager_ = nullptr; |
| 84 | 85 |
| 85 // Handler for swipe and drag gestures. | 86 // Handler for swipe and drag gestures. |
| 86 ShelfGestureHandler gesture_handler_; | 87 ShelfGestureHandler gesture_handler_; |
| 87 | 88 |
| 88 base::ObserverList<WmShelfObserver> observers_; | 89 base::ObserverList<WmShelfObserver> observers_; |
| 89 | 90 |
| 90 DISALLOW_COPY_AND_ASSIGN(WmShelfAura); | 91 DISALLOW_COPY_AND_ASSIGN(WmShelfAura); |
| 91 }; | 92 }; |
| 92 | 93 |
| 93 } // namespace ash | 94 } // namespace ash |
| 94 | 95 |
| 95 #endif // ASH_AURA_WM_SHELF_AURA_H_ | 96 #endif // ASH_AURA_WM_SHELF_AURA_H_ |
| OLD | NEW |