Revert auto-hide-invisible mode for ARC++

components/exo/shell_surface.cc

 // Copyright 2015 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 "components/exo/shell_surface.h"
 
 #include "ash/aura/wm_window_aura.h"
+#include "ash/common/shelf/wm_shelf.h"
 #include "ash/common/shell_window_ids.h"
 #include "ash/common/wm/window_resizer.h"
 #include "ash/common/wm/window_state.h"
 #include "ash/common/wm/window_state_delegate.h"
-#include "ash/shell.h"
+#include "ash/common/wm_shell.h"
 #include "ash/wm/window_state_aura.h"
 #include "ash/wm/window_util.h"
 #include "base/logging.h"
 #include "base/macros.h"
 #include "base/memory/ptr_util.h"
 #include "base/strings/utf_string_conversions.h"
 #include "base/trace_event/trace_event.h"
 #include "base/trace_event/trace_event_argument.h"
 #include "components/exo/surface.h"
 #include "ui/aura/client/aura_constants.h"
@@ skipping 23 matching lines @@
   ui::KeyboardCode keycode;
   int modifiers;
 } kCloseWindowAccelerators[] = {
     {ui::VKEY_W, ui::EF_CONTROL_DOWN},
     {ui::VKEY_W, ui::EF_SHIFT_DOWN | ui::EF_CONTROL_DOWN},
     {ui::VKEY_F4, ui::EF_ALT_DOWN}};
 
 void UpdateShelfStateForFullscreenChange(views::Widget* widget) {
   ash::wm::WindowState* window_state =
       ash::wm::GetWindowState(widget->GetNativeWindow());
-  window_state->set_shelf_mode_in_fullscreen(
-      ash::wm::WindowState::SHELF_AUTO_HIDE_INVISIBLE);
-  ash::Shell::GetInstance()->UpdateShelfVisibility();
+  window_state->set_hide_shelf_when_fullscreen(false);
+  for (ash::WmWindow* root_window : ash::WmShell::Get()->GetAllRootWindows())
+    ash::WmShelf::ForWindow(root_window)->UpdateVisibilityState();
 }
 
 class CustomFrameView : public views::NonClientFrameView {
  public:
   explicit CustomFrameView(views::Widget* widget) : widget_(widget) {}
   ~CustomFrameView() override {}
 
   // Overridden from views::NonClientFrameView:
   gfx::Rect GetBoundsForClientView() const override { return bounds(); }
   gfx::Rect GetWindowBoundsForClientBounds(
@@ skipping 325 matching lines @@
 void ShellSurface::SetFullscreen(bool fullscreen) {
   TRACE_EVENT1("exo", "ShellSurface::SetFullscreen", "fullscreen", fullscreen);
 
   if (!widget_)
     CreateShellSurfaceWidget(ui::SHOW_STATE_FULLSCREEN);
 
   // Note: This will ask client to configure its surface even if fullscreen
   // state doesn't change.
   ScopedConfigure scoped_configure(this, true);
   widget_->SetFullscreen(fullscreen);
-  UpdateShelfStateForFullscreenChange(widget_);
 }
 
 void ShellSurface::SetPinned(bool pinned, bool trusted) {
   TRACE_EVENT2("exo", "ShellSurface::SetPinned", "pinned", pinned, "trusted",
                trusted);
 
   if (!widget_)
     CreateShellSurfaceWidget(ui::SHOW_STATE_NORMAL);
 
   // Note: This will ask client to configure its surface even if pinned
@@ skipping 880 matching lines @@
       shadow_overlay_->layer()->Add(shadow->layer());
       window->AddChild(shadow_overlay_);
       shadow_overlay_->Show();
     }
     shadow_overlay_->SetBounds(shadow_bounds);
     shadow->SetContentBounds(gfx::Rect(shadow_bounds.size()));
   }
 }
 
 }  // namespace exo