| 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_COMMON_SHELF_WM_SHELF_H_ | 5 #ifndef ASH_COMMON_SHELF_WM_SHELF_H_ |
| 6 #define ASH_COMMON_SHELF_WM_SHELF_H_ | 6 #define ASH_COMMON_SHELF_WM_SHELF_H_ |
| 7 | 7 |
| 8 #include <memory> | 8 #include <memory> |
| 9 | 9 |
| 10 #include "ash/ash_export.h" | 10 #include "ash/ash_export.h" |
| (...skipping 145 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 156 // Layout manager for the shelf container window. Instances are constructed by | 156 // Layout manager for the shelf container window. Instances are constructed by |
| 157 // ShelfWidget and lifetimes are managed by the container windows themselves. | 157 // ShelfWidget and lifetimes are managed by the container windows themselves. |
| 158 ShelfLayoutManager* shelf_layout_manager_ = nullptr; | 158 ShelfLayoutManager* shelf_layout_manager_ = nullptr; |
| 159 | 159 |
| 160 std::unique_ptr<ShelfWidget> shelf_widget_; | 160 std::unique_ptr<ShelfWidget> shelf_widget_; |
| 161 | 161 |
| 162 // Internal implementation detail. Do not expose externally. Owned by views | 162 // Internal implementation detail. Do not expose externally. Owned by views |
| 163 // hierarchy. Null before login and in secondary display init. | 163 // hierarchy. Null before login and in secondary display init. |
| 164 ShelfView* shelf_view_ = nullptr; | 164 ShelfView* shelf_view_ = nullptr; |
| 165 | 165 |
| 166 // These initial values hide the shelf until user preferences are available. |
| 166 ShelfAlignment alignment_ = SHELF_ALIGNMENT_BOTTOM_LOCKED; | 167 ShelfAlignment alignment_ = SHELF_ALIGNMENT_BOTTOM_LOCKED; |
| 168 ShelfAutoHideBehavior auto_hide_behavior_ = SHELF_AUTO_HIDE_ALWAYS_HIDDEN; |
| 167 | 169 |
| 168 // Sets shelf alignment to bottom during login and screen lock. | 170 // Sets shelf alignment to bottom during login and screen lock. |
| 169 std::unique_ptr<ShelfLockingManager> shelf_locking_manager_; | 171 std::unique_ptr<ShelfLockingManager> shelf_locking_manager_; |
| 170 | 172 |
| 171 ShelfAutoHideBehavior auto_hide_behavior_ = SHELF_AUTO_HIDE_BEHAVIOR_NEVER; | |
| 172 | |
| 173 base::ObserverList<WmShelfObserver> observers_; | 173 base::ObserverList<WmShelfObserver> observers_; |
| 174 | 174 |
| 175 // Forwards mouse and gesture events to ShelfLayoutManager for auto-hide. | 175 // Forwards mouse and gesture events to ShelfLayoutManager for auto-hide. |
| 176 // TODO(mash): Facilitate simliar functionality in mash: crbug.com/631216 | 176 // TODO(mash): Facilitate simliar functionality in mash: crbug.com/631216 |
| 177 std::unique_ptr<AutoHideEventHandler> auto_hide_event_handler_; | 177 std::unique_ptr<AutoHideEventHandler> auto_hide_event_handler_; |
| 178 | 178 |
| 179 // Forwards touch gestures on a bezel sensor to the shelf. | 179 // Forwards touch gestures on a bezel sensor to the shelf. |
| 180 // TODO(mash): Facilitate simliar functionality in mash: crbug.com/636647 | 180 // TODO(mash): Facilitate simliar functionality in mash: crbug.com/636647 |
| 181 std::unique_ptr<ShelfBezelEventHandler> bezel_event_handler_; | 181 std::unique_ptr<ShelfBezelEventHandler> bezel_event_handler_; |
| 182 | 182 |
| 183 DISALLOW_COPY_AND_ASSIGN(WmShelf); | 183 DISALLOW_COPY_AND_ASSIGN(WmShelf); |
| 184 }; | 184 }; |
| 185 | 185 |
| 186 } // namespace ash | 186 } // namespace ash |
| 187 | 187 |
| 188 #endif // ASH_COMMON_SHELF_WM_SHELF_H_ | 188 #endif // ASH_COMMON_SHELF_WM_SHELF_H_ |
| OLD | NEW |