Chromium Code Reviews| Index: ash/shelf/shelf_layout_manager.h | 
| diff --git a/ash/shelf/shelf_layout_manager.h b/ash/shelf/shelf_layout_manager.h | 
| index b7e68fabc55c4ff922638263917f41662a49cc17..729bdf767cc2d0c54a7bdcedb51286d302365194 100644 | 
| --- a/ash/shelf/shelf_layout_manager.h | 
| +++ b/ash/shelf/shelf_layout_manager.h | 
| @@ -60,11 +60,13 @@ class ASH_EXPORT ShelfLayoutManager | 
| ShelfLayoutManager(ShelfWidget* shelf_widget, Shelf* shelf); | 
| ~ShelfLayoutManager() override; | 
| + // Called when the AppList status changes. | 
| + void OnAppListIsActive(); | 
| 
 
xiyuan
2017/06/06 16:50:18
Can this be removed since we have OnAppListVisibil
 
newcomer
2017/06/06 17:12:56
Done.
 
 | 
| + | 
| bool updating_bounds() const { return updating_bounds_; } | 
| // Clears internal data for shutdown process. | 
| void PrepareForShutdown(); | 
| - | 
| // Returns whether the shelf and its contents (shelf, status) are visible | 
| // on the screen. | 
| bool IsVisible() const; | 
| @@ -138,6 +140,8 @@ class ASH_EXPORT ShelfLayoutManager | 
| void OnPinnedStateChanged(aura::Window* pinned_window) override; | 
| void OnVirtualKeyboardStateChanged(bool activated, | 
| aura::Window* root_window) override; | 
| + void OnAppListVisibilityChanged(bool shown, | 
| + aura::Window* root_window) override; | 
| // Overridden from wm::ActivationChangeObserver: | 
| void OnWindowActivated(ActivationReason reason, | 
| @@ -313,6 +317,10 @@ class ASH_EXPORT ShelfLayoutManager | 
| // Do any windows overlap the shelf? This is maintained by WorkspaceManager. | 
| bool window_overlaps_shelf_; | 
| + // Is the AppList being shown? This is maintained by | 
| + // OnAppListVisibilityChanged. | 
| + bool app_list_is_being_shown; | 
| 
 
msw
2017/06/06 17:56:31
Add a trailing underscore and consider is_app_list
 
newcomer
2017/06/06 23:26:27
Done.
 
 | 
| + | 
| base::OneShotTimer auto_hide_timer_; | 
| // Whether the mouse was over the shelf when the auto hide timer started. |