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

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

Issue 2688353005: Fix shelf alignment and auto-hide initialization. (Closed)
Patch Set: Cleanup Created 3 years, 10 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') | ash/common/test/test_shelf_delegate.cc » ('J')
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"
(...skipping 144 matching lines...) Expand 10 before | Expand all | Expand 10 after
155 // Layout manager for the shelf container window. Instances are constructed by 155 // Layout manager for the shelf container window. Instances are constructed by
156 // ShelfWidget and lifetimes are managed by the container windows themselves. 156 // ShelfWidget and lifetimes are managed by the container windows themselves.
157 ShelfLayoutManager* shelf_layout_manager_ = nullptr; 157 ShelfLayoutManager* shelf_layout_manager_ = nullptr;
158 158
159 std::unique_ptr<ShelfWidget> shelf_widget_; 159 std::unique_ptr<ShelfWidget> shelf_widget_;
160 160
161 // Internal implementation detail. Do not expose externally. Owned by views 161 // Internal implementation detail. Do not expose externally. Owned by views
162 // hierarchy. Null before login and in secondary display init. 162 // hierarchy. Null before login and in secondary display init.
163 ShelfView* shelf_view_ = nullptr; 163 ShelfView* shelf_view_ = nullptr;
164 164
165 // These initial values hide the shelf until user preferences are available.
165 ShelfAlignment alignment_ = SHELF_ALIGNMENT_BOTTOM_LOCKED; 166 ShelfAlignment alignment_ = SHELF_ALIGNMENT_BOTTOM_LOCKED;
167 ShelfAutoHideBehavior auto_hide_behavior_ = SHELF_AUTO_HIDE_ALWAYS_HIDDEN;
James Cook 2017/02/14 01:38:03 This makes me a bit nervous. It's probably fine, b
msw 2017/02/14 05:13:18 Done. I had already run OOBE with an existing acco
166 168
167 // Sets shelf alignment to bottom during login and screen lock. 169 // Sets shelf alignment to bottom during login and screen lock.
168 std::unique_ptr<ShelfLockingManager> shelf_locking_manager_; 170 std::unique_ptr<ShelfLockingManager> shelf_locking_manager_;
169 171
170 ShelfAutoHideBehavior auto_hide_behavior_ = SHELF_AUTO_HIDE_BEHAVIOR_NEVER;
171
172 base::ObserverList<WmShelfObserver> observers_; 172 base::ObserverList<WmShelfObserver> observers_;
173 173
174 // Forwards mouse and gesture events to ShelfLayoutManager for auto-hide. 174 // Forwards mouse and gesture events to ShelfLayoutManager for auto-hide.
175 // TODO(mash): Facilitate simliar functionality in mash: crbug.com/631216 175 // TODO(mash): Facilitate simliar functionality in mash: crbug.com/631216
176 std::unique_ptr<AutoHideEventHandler> auto_hide_event_handler_; 176 std::unique_ptr<AutoHideEventHandler> auto_hide_event_handler_;
177 177
178 // Forwards touch gestures on a bezel sensor to the shelf. 178 // Forwards touch gestures on a bezel sensor to the shelf.
179 // TODO(mash): Facilitate simliar functionality in mash: crbug.com/636647 179 // TODO(mash): Facilitate simliar functionality in mash: crbug.com/636647
180 std::unique_ptr<ShelfBezelEventHandler> bezel_event_handler_; 180 std::unique_ptr<ShelfBezelEventHandler> bezel_event_handler_;
181 181
182 DISALLOW_COPY_AND_ASSIGN(WmShelf); 182 DISALLOW_COPY_AND_ASSIGN(WmShelf);
183 }; 183 };
184 184
185 } // namespace ash 185 } // namespace ash
186 186
187 #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') | ash/common/test/test_shelf_delegate.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698