| Index: ash/shelf/shelf_layout_manager.h
|
| diff --git a/ash/shelf/shelf_layout_manager.h b/ash/shelf/shelf_layout_manager.h
|
| index 7e66fb2914c888be06bc909c871ef7a9e0b725f5..7c3731a32cc7297f96d06b73470c0005b7041292 100644
|
| --- a/ash/shelf/shelf_layout_manager.h
|
| +++ b/ash/shelf/shelf_layout_manager.h
|
| @@ -64,7 +64,6 @@ class ASH_EXPORT ShelfLayoutManager
|
|
|
| // 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 +137,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,
|
| @@ -317,6 +318,10 @@ class ASH_EXPORT ShelfLayoutManager
|
| // Do any windows overlap the shelf? This is maintained by WorkspaceManager.
|
| bool window_overlaps_shelf_;
|
|
|
| + // Is the AppList visible? This is maintained by
|
| + // OnAppListVisibilityChanged.
|
| + bool is_app_list_visible_ = false;
|
| +
|
| base::OneShotTimer auto_hide_timer_;
|
|
|
| // Whether the mouse was over the shelf when the auto hide timer started.
|
|
|