Revert auto-hide-invisible mode for ARC++

ash/common/wm/window_state.h

Index: ash/common/wm/window_state.h
diff --git a/ash/common/wm/window_state.h b/ash/common/wm/window_state.h
index 501b540e458ab9b0453194a423edb73c51fbead8..9d4eaac8c23ad95a1c594893277dd5ef5852658f 100644
--- a/ash/common/wm/window_state.h
+++ b/ash/common/wm/window_state.h
@@ -196,21 +196,14 @@ class ASH_EXPORT WindowState {
     unminimize_to_restore_bounds_ = value;
   }
 
-  // Controls the shelf mode when this window is in fullscreen state.
-  // This enum is temporary until MD immersive is launched.
-  // TODO(oshima): Remove this when MD immersive 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.
-  FullscreenShelfMode shelf_mode_in_fullscreen() const {
-    return shelf_mode_in_fullscreen_;
+  bool hide_shelf_when_fullscreen() const {
+    return hide_shelf_when_fullscreen_;
   }
-  void set_shelf_mode_in_fullscreen(FullscreenShelfMode value) {
-    shelf_mode_in_fullscreen_ = value;
+
+  void set_hide_shelf_when_fullscreen(bool value) {
+    hide_shelf_when_fullscreen_ = value;
   }
 
   // If the minimum visibility is true, ash will try to keep a
@@ -387,7 +380,7 @@ class ASH_EXPORT WindowState {
   bool unminimize_to_restore_bounds_;
   bool in_immersive_fullscreen_;
   bool ignore_keyboard_bounds_change_ = false;
-  FullscreenShelfMode shelf_mode_in_fullscreen_ = SHELF_HIDDEN;
+  bool hide_shelf_when_fullscreen_;
   bool minimum_visibility_;
   bool can_be_dragged_;
   bool cached_always_on_top_;