| Index: ash/common/wm/window_state.h
|
| diff --git a/ash/common/wm/window_state.h b/ash/common/wm/window_state.h
|
| index db48217669be7f998a799680a29f15644cfdce66..fb7b5a8ff80f2e381da61dc698a86f8b89fba863 100644
|
| --- a/ash/common/wm/window_state.h
|
| +++ b/ash/common/wm/window_state.h
|
| @@ -196,14 +196,20 @@ class ASH_EXPORT WindowState {
|
| unminimize_to_restore_bounds_ = value;
|
| }
|
|
|
| + // Controls the shelf mode when this window is in fullscreen state.
|
| + // TODO(oshima): Remove this when MD ash is launched.
|
| + enum FullscreenShelfMode {
|
| + SHELF_HIDDEN,
|
| + SHELF_AUTO_HIDE_VISIBLE,
|
| + SHELF_AUTO_HIDE_INVISIBLE,
|
| + };
|
| // Gets/sets whether the shelf should be hidden when this window is
|
| // fullscreen.
|
| - bool hide_shelf_when_fullscreen() const {
|
| - return hide_shelf_when_fullscreen_;
|
| + FullscreenShelfMode shelf_mode_in_fullscreen() const {
|
| + return shelf_mode_in_fullscreen_; // hide_shelf_when_fullscreen_;
|
| }
|
| -
|
| - void set_hide_shelf_when_fullscreen(bool value) {
|
| - hide_shelf_when_fullscreen_ = value;
|
| + void set_shelf_mode_in_fullscreen(FullscreenShelfMode value) {
|
| + shelf_mode_in_fullscreen_ = value;
|
| }
|
|
|
| // If the minimum visibility is true, ash will try to keep a
|
| @@ -371,7 +377,7 @@ class ASH_EXPORT WindowState {
|
| bool unminimize_to_restore_bounds_;
|
| bool in_immersive_fullscreen_;
|
| bool ignore_keyboard_bounds_change_ = false;
|
| - bool hide_shelf_when_fullscreen_;
|
| + FullscreenShelfMode shelf_mode_in_fullscreen_ = SHELF_HIDDEN;
|
| bool minimum_visibility_;
|
| bool can_be_dragged_;
|
| bool cached_always_on_top_;
|
|
|