| OLD | NEW |
| 1 // Copyright 2013 The Chromium Authors. All rights reserved. | 1 // Copyright 2013 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_SHELF_SHELF_H_ | 5 #ifndef ASH_SHELF_SHELF_H_ |
| 6 #define ASH_SHELF_SHELF_H_ | 6 #define ASH_SHELF_SHELF_H_ |
| 7 | 7 |
| 8 #include <stdint.h> | 8 #include <stdint.h> |
| 9 | 9 |
| 10 #include <memory> | 10 #include <memory> |
| (...skipping 16 matching lines...) Expand all Loading... |
| 27 } | 27 } |
| 28 | 28 |
| 29 namespace views { | 29 namespace views { |
| 30 class View; | 30 class View; |
| 31 } | 31 } |
| 32 | 32 |
| 33 namespace ash { | 33 namespace ash { |
| 34 class AppListButton; | 34 class AppListButton; |
| 35 class FocusCycler; | 35 class FocusCycler; |
| 36 class ShelfDelegate; | 36 class ShelfDelegate; |
| 37 class ShelfIconObserver; | |
| 38 class ShelfView; | 37 class ShelfView; |
| 39 class WmShelf; | 38 class WmShelf; |
| 40 | 39 |
| 41 namespace test { | 40 namespace test { |
| 42 class ShelfTestAPI; | 41 class ShelfTestAPI; |
| 43 } | 42 } |
| 44 | 43 |
| 45 // Controller for shelf state. | 44 // Controller for shelf state. |
| 46 // DEPRECATED: WmShelf is replacing this class as part of the mus/mash refactor. | 45 // DEPRECATED: WmShelf is replacing this class as part of the mus/mash refactor. |
| 47 // Use WmShelf for access to state (visibility, auto-hide, etc.). | 46 // Use WmShelf for access to state (visibility, auto-hide, etc.). |
| (...skipping 35 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 83 // when dragging panels to reposition them with respect to the other panels. | 82 // when dragging panels to reposition them with respect to the other panels. |
| 84 void UpdateIconPositionForWindow(WmWindow* window); | 83 void UpdateIconPositionForWindow(WmWindow* window); |
| 85 | 84 |
| 86 // Activates the the shelf item specified by the index in the list of shelf | 85 // Activates the the shelf item specified by the index in the list of shelf |
| 87 // items. | 86 // items. |
| 88 void ActivateShelfItem(int index); | 87 void ActivateShelfItem(int index); |
| 89 | 88 |
| 90 // Cycles the window focus linearly over the current shelf items. | 89 // Cycles the window focus linearly over the current shelf items. |
| 91 void CycleWindowLinear(CycleDirection direction); | 90 void CycleWindowLinear(CycleDirection direction); |
| 92 | 91 |
| 93 void AddIconObserver(ShelfIconObserver* observer); | |
| 94 void RemoveIconObserver(ShelfIconObserver* observer); | |
| 95 | |
| 96 // Returns true if the shelf is showing a context menu. | 92 // Returns true if the shelf is showing a context menu. |
| 97 bool IsShowingMenu() const; | 93 bool IsShowingMenu() const; |
| 98 | 94 |
| 99 // TODO(jamescook): Migrate this to ShelfWidget. | 95 // TODO(jamescook): Migrate this to ShelfWidget. |
| 100 bool IsShowingOverflowBubble() const; | 96 bool IsShowingOverflowBubble() const; |
| 101 | 97 |
| 102 // TODO(jamescook): Migrate to ShelfWidget::IsShelfVisible(). | 98 // TODO(jamescook): Migrate to ShelfWidget::IsShelfVisible(). |
| 103 bool IsVisible() const; | 99 bool IsVisible() const; |
| 104 | 100 |
| 105 void SchedulePaint(); | 101 void SchedulePaint(); |
| (...skipping 38 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 144 | 140 |
| 145 ShelfAlignment alignment_ = SHELF_ALIGNMENT_BOTTOM; | 141 ShelfAlignment alignment_ = SHELF_ALIGNMENT_BOTTOM; |
| 146 ShelfAutoHideBehavior auto_hide_behavior_ = SHELF_AUTO_HIDE_BEHAVIOR_NEVER; | 142 ShelfAutoHideBehavior auto_hide_behavior_ = SHELF_AUTO_HIDE_BEHAVIOR_NEVER; |
| 147 | 143 |
| 148 DISALLOW_COPY_AND_ASSIGN(Shelf); | 144 DISALLOW_COPY_AND_ASSIGN(Shelf); |
| 149 }; | 145 }; |
| 150 | 146 |
| 151 } // namespace ash | 147 } // namespace ash |
| 152 | 148 |
| 153 #endif // ASH_SHELF_SHELF_H_ | 149 #endif // ASH_SHELF_SHELF_H_ |
| OLD | NEW |