[Refactor] Replace kFullscreenUsesMinimalChromeKey with WindowState::hide_shelf_when_fullscreen()

chrome/browser/ui/views/frame/immersive_mode_controller_ash.cc

 // Copyright 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/ui/views/frame/immersive_mode_controller_ash.h"
 
 #include <set>
 #include <vector>
 
 #include "ash/ash_switches.h"
 #include "ash/shell.h"
-#include "ash/wm/window_properties.h"
+#include "ash/wm/window_state.h"
 #include "base/command_line.h"
 #include "chrome/browser/chrome_notification_types.h"
 #include "chrome/browser/ui/fullscreen/fullscreen_controller.h"
 #include "chrome/browser/ui/views/bookmarks/bookmark_bar_view.h"
 #include "chrome/browser/ui/views/frame/top_container_view.h"
 #include "content/public/browser/notification_service.h"
 #include "content/public/browser/web_contents.h"
 #include "content/public/browser/web_contents_view.h"
 #include "ui/aura/client/activation_client.h"
 #include "ui/aura/client/aura_constants.h"
@@ skipping 884 matching lines @@
   return false;
 }
 
 void ImmersiveModeControllerAsh::UpdateUseMinimalChrome(Layout layout) {
   // May be NULL in tests.
   FullscreenController* fullscreen_controller =
       delegate_->GetFullscreenController();
   bool in_tab_fullscreen = fullscreen_controller ?
       fullscreen_controller->IsFullscreenForTabOrPending() : false;
   bool use_minimal_chrome = !in_tab_fullscreen && enabled_;
-  native_window_->SetProperty(ash::internal::kFullscreenUsesMinimalChromeKey,
-                              use_minimal_chrome);
+
+  // When using minimal chrome, the shelf is auto-hidden. The auto-hidden shelf
+  // displays a 3px 'light bar' when it is closed. Otherwise, the shelf is
+  // hidden completely and cannot be revealed.
+  ash::wm::GetWindowState(native_window_)->set_hide_shelf_when_fullscreen(
+      !use_minimal_chrome);
 
   TabIndicatorVisibility previous_tab_indicator_visibility =
       tab_indicator_visibility_;
   if (tab_indicator_visibility_ != TAB_INDICATORS_FORCE_HIDE) {
     tab_indicator_visibility_ = use_minimal_chrome ?
         TAB_INDICATORS_SHOW : TAB_INDICATORS_HIDE;
   }
 
-  // Ash on Windows may not have a shell.
-  if (ash::Shell::HasInstance()) {
-    // When using minimal chrome, the shelf is auto-hidden. The auto-hidden
-    // shelf displays a 3px 'light bar' when it is closed.
-    ash::Shell::GetInstance()->UpdateShelfVisibility();
-  }
+  ash::Shell::GetInstance()->UpdateShelfVisibility();
 
   if (tab_indicator_visibility_ != previous_tab_indicator_visibility) {
     // If the top-of-window views are revealed or animating, the change will
     // take effect with the layout once the top-of-window views are closed.
     if (layout == LAYOUT_YES && reveal_state_ == CLOSED)
       LayoutBrowserRootView();
   }
 }
 
 int ImmersiveModeControllerAsh::GetAnimationDuration(Animate animate) const {
@@ skipping 212 matching lines @@
     aura::Window* transient_child = transient_children[i];
     views::BubbleDelegateView* bubble_delegate =
         AsBubbleDelegate(transient_child);
     if (bubble_delegate &&
         bubble_delegate->GetAnchorView() &&
         top_container_->Contains(bubble_delegate->GetAnchorView())) {
       bubble_manager_->StartObserving(transient_child);
     }
   }
 }