Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(114)

Side by Side Diff: ash/common/shelf/wm_shelf.h

Issue 2649033005: Removes a tracing CHECK supposed to investigate infinite SetAutoHideBehavior (Closed)
Patch Set: Created 3 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « no previous file | ash/common/shelf/wm_shelf.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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"
15 14
16 namespace gfx { 15 namespace gfx {
17 class Rect; 16 class Rect;
18 } 17 }
19 18
20 namespace ui { 19 namespace ui {
21 class GestureEvent; 20 class GestureEvent;
22 } 21 }
23 22
24 namespace ash { 23 namespace ash {
(...skipping 140 matching lines...) Expand 10 before | Expand all | Expand 10 after
165 164
166 ShelfAlignment alignment_ = SHELF_ALIGNMENT_BOTTOM_LOCKED; 165 ShelfAlignment alignment_ = SHELF_ALIGNMENT_BOTTOM_LOCKED;
167 166
168 // Sets shelf alignment to bottom during login and screen lock. 167 // Sets shelf alignment to bottom during login and screen lock.
169 std::unique_ptr<ShelfLockingManager> shelf_locking_manager_; 168 std::unique_ptr<ShelfLockingManager> shelf_locking_manager_;
170 169
171 ShelfAutoHideBehavior auto_hide_behavior_ = SHELF_AUTO_HIDE_BEHAVIOR_NEVER; 170 ShelfAutoHideBehavior auto_hide_behavior_ = SHELF_AUTO_HIDE_BEHAVIOR_NEVER;
172 171
173 base::ObserverList<WmShelfObserver> observers_; 172 base::ObserverList<WmShelfObserver> observers_;
174 173
175 // Temporary. Used to investigate http://crbug.com/665093 .
176 base::TimeTicks time_last_auto_hide_change_;
177 int count_auto_hide_changes_ = 0;
178
179 // Forwards mouse and gesture events to ShelfLayoutManager for auto-hide. 174 // Forwards mouse and gesture events to ShelfLayoutManager for auto-hide.
180 // TODO(mash): Facilitate simliar functionality in mash: crbug.com/631216 175 // TODO(mash): Facilitate simliar functionality in mash: crbug.com/631216
181 std::unique_ptr<AutoHideEventHandler> auto_hide_event_handler_; 176 std::unique_ptr<AutoHideEventHandler> auto_hide_event_handler_;
182 177
183 // Forwards touch gestures on a bezel sensor to the shelf. 178 // Forwards touch gestures on a bezel sensor to the shelf.
184 // TODO(mash): Facilitate simliar functionality in mash: crbug.com/636647 179 // TODO(mash): Facilitate simliar functionality in mash: crbug.com/636647
185 std::unique_ptr<ShelfBezelEventHandler> bezel_event_handler_; 180 std::unique_ptr<ShelfBezelEventHandler> bezel_event_handler_;
186 181
187 DISALLOW_COPY_AND_ASSIGN(WmShelf); 182 DISALLOW_COPY_AND_ASSIGN(WmShelf);
188 }; 183 };
189 184
190 } // namespace ash 185 } // namespace ash
191 186
192 #endif // ASH_COMMON_SHELF_WM_SHELF_H_ 187 #endif // ASH_COMMON_SHELF_WM_SHELF_H_
OLDNEW
« no previous file with comments | « no previous file | ash/common/shelf/wm_shelf.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698