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" |
11 #include "ash/common/shelf/shelf_layout_manager_observer.h" | 11 #include "ash/common/shelf/shelf_layout_manager_observer.h" |
12 #include "ash/public/cpp/shelf_types.h" | 12 #include "ash/public/cpp/shelf_types.h" |
13 #include "base/observer_list.h" | 13 #include "base/observer_list.h" |
| 14 #include "base/time/time.h" |
14 | 15 |
15 namespace gfx { | 16 namespace gfx { |
16 class Rect; | 17 class Rect; |
17 } | 18 } |
18 | 19 |
19 namespace ui { | 20 namespace ui { |
20 class GestureEvent; | 21 class GestureEvent; |
21 } | 22 } |
22 | 23 |
23 namespace ash { | 24 namespace ash { |
(...skipping 145 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
169 | 170 |
170 ShelfAlignment alignment_ = SHELF_ALIGNMENT_BOTTOM_LOCKED; | 171 ShelfAlignment alignment_ = SHELF_ALIGNMENT_BOTTOM_LOCKED; |
171 | 172 |
172 // Sets shelf alignment to bottom during login and screen lock. | 173 // Sets shelf alignment to bottom during login and screen lock. |
173 std::unique_ptr<ShelfLockingManager> shelf_locking_manager_; | 174 std::unique_ptr<ShelfLockingManager> shelf_locking_manager_; |
174 | 175 |
175 ShelfAutoHideBehavior auto_hide_behavior_ = SHELF_AUTO_HIDE_BEHAVIOR_NEVER; | 176 ShelfAutoHideBehavior auto_hide_behavior_ = SHELF_AUTO_HIDE_BEHAVIOR_NEVER; |
176 | 177 |
177 base::ObserverList<WmShelfObserver> observers_; | 178 base::ObserverList<WmShelfObserver> observers_; |
178 | 179 |
| 180 // Temporary. Used to investigate http://crbug.com/665093 . |
| 181 base::TimeTicks time_last_auto_hide_change_; |
| 182 int count_auto_hide_changes_ = 0; |
| 183 |
179 DISALLOW_COPY_AND_ASSIGN(WmShelf); | 184 DISALLOW_COPY_AND_ASSIGN(WmShelf); |
180 }; | 185 }; |
181 | 186 |
182 } // namespace ash | 187 } // namespace ash |
183 | 188 |
184 #endif // ASH_COMMON_SHELF_WM_SHELF_H_ | 189 #endif // ASH_COMMON_SHELF_WM_SHELF_H_ |
OLD | NEW |