| Index: ash/shelf/shelf_layout_manager.h
|
| diff --git a/ash/shelf/shelf_layout_manager.h b/ash/shelf/shelf_layout_manager.h
|
| index 06f6e67cf53988a0a1ea9c271649fc9b7f39cd19..a5fd6ce0292ddf65ec0509bf39b3b05ea782681f 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 is active in order to restrict background behavior.
|
| + void OnAppListIsActive(bool active);
|
| +
|
| 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;
|
| @@ -313,6 +315,7 @@ class ASH_EXPORT ShelfLayoutManager
|
| // Do any windows overlap the shelf? This is maintained by WorkspaceManager.
|
| bool window_overlaps_shelf_;
|
|
|
| + bool app_list_is_active_ = false;
|
| base::OneShotTimer auto_hide_timer_;
|
|
|
| // Whether the mouse was over the shelf when the auto hide timer started.
|
|
|