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

Side by Side Diff: ash/shelf/shelf_layout_manager.h

Issue 2946363002: Added 1 liner to fix shelf background hiding on side shelf alignment. (Closed)
Patch Set: Added 1 liner to fix shelf background hiding on side shelf alignment. Created 3 years, 6 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 | « ash/app_list/app_list_presenter_delegate_unittest.cc ('k') | ash/shelf/shelf_layout_manager.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 2012 The Chromium Authors. All rights reserved. 1 // Copyright 2012 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_LAYOUT_MANAGER_H_ 5 #ifndef ASH_SHELF_SHELF_LAYOUT_MANAGER_H_
6 #define ASH_SHELF_SHELF_LAYOUT_MANAGER_H_ 6 #define ASH_SHELF_SHELF_LAYOUT_MANAGER_H_
7 7
8 #include <memory> 8 #include <memory>
9 9
10 #include "ash/ash_export.h" 10 #include "ash/ash_export.h"
(...skipping 310 matching lines...) Expand 10 before | Expand all | Expand 10 after
321 // Is the AppList visible? This is maintained by 321 // Is the AppList visible? This is maintained by
322 // OnAppListVisibilityChanged. 322 // OnAppListVisibilityChanged.
323 bool is_app_list_visible_ = false; 323 bool is_app_list_visible_ = false;
324 324
325 base::OneShotTimer auto_hide_timer_; 325 base::OneShotTimer auto_hide_timer_;
326 326
327 // Whether the mouse was over the shelf when the auto hide timer started. 327 // Whether the mouse was over the shelf when the auto hide timer started.
328 // False when neither the auto hide timer nor the timer task are running. 328 // False when neither the auto hide timer nor the timer task are running.
329 bool mouse_over_shelf_when_auto_hide_timer_started_; 329 bool mouse_over_shelf_when_auto_hide_timer_started_;
330 330
331 // Whether the fullscreen app list feature is enabled.
332 bool is_fullscreen_app_list_enabled_;
James Cook 2017/06/22 00:32:46 nit: const
newcomer 2017/07/11 19:54:12 Done.
333
331 base::ObserverList<ShelfLayoutManagerObserver> observers_; 334 base::ObserverList<ShelfLayoutManagerObserver> observers_;
332 335
333 // The shelf reacts to gesture-drags, and can be set to auto-hide for certain 336 // The shelf reacts to gesture-drags, and can be set to auto-hide for certain
334 // gestures. Some shelf behaviour (e.g. visibility state, background color 337 // gestures. Some shelf behaviour (e.g. visibility state, background color
335 // etc.) are affected by various stages of the drag. The enum keeps track of 338 // etc.) are affected by various stages of the drag. The enum keeps track of
336 // the present status of the gesture drag. 339 // the present status of the gesture drag.
337 enum GestureDragStatus { 340 enum GestureDragStatus {
338 GESTURE_DRAG_NONE, 341 GESTURE_DRAG_NONE,
339 GESTURE_DRAG_IN_PROGRESS, 342 GESTURE_DRAG_IN_PROGRESS,
340 GESTURE_DRAG_CANCEL_IN_PROGRESS, 343 GESTURE_DRAG_CANCEL_IN_PROGRESS,
(...skipping 33 matching lines...) Expand 10 before | Expand all | Expand 10 after
374 keyboard::KeyboardControllerObserver> 377 keyboard::KeyboardControllerObserver>
375 keyboard_observer_; 378 keyboard_observer_;
376 ScopedSessionObserver scoped_session_observer_; 379 ScopedSessionObserver scoped_session_observer_;
377 380
378 DISALLOW_COPY_AND_ASSIGN(ShelfLayoutManager); 381 DISALLOW_COPY_AND_ASSIGN(ShelfLayoutManager);
379 }; 382 };
380 383
381 } // namespace ash 384 } // namespace ash
382 385
383 #endif // ASH_SHELF_SHELF_LAYOUT_MANAGER_H_ 386 #endif // ASH_SHELF_SHELF_LAYOUT_MANAGER_H_
OLDNEW
« no previous file with comments | « ash/app_list/app_list_presenter_delegate_unittest.cc ('k') | ash/shelf/shelf_layout_manager.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698