| 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..60b48ac6e5c189376d32143752b569b896cd2f1b 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();
|
| +
|
| 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 OnAppListShownOrDismissed(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
|
| + // OnAppListShownOrDismissed.
|
| + bool app_list_is_being_shown;
|
| +
|
| base::OneShotTimer auto_hide_timer_;
|
|
|
| // Whether the mouse was over the shelf when the auto hide timer started.
|
|
|