Fixing problem with edge swipe exiting immersive mode

ash/wm/immersive_fullscreen_controller.cc

 // Copyright 2013 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 "ash/wm/immersive_fullscreen_controller.h"
 
 #include <set>
 
 #include "ash/ash_constants.h"
 #include "ash/shell.h"
@@ skipping 256 matching lines @@
 }
 
 void ImmersiveFullscreenController::SetEnabled(WindowType window_type,
                                                bool enabled) {
   if (enabled_ == enabled)
     return;
   enabled_ = enabled;
 
   EnableWindowObservers(enabled_);
 
+  ash::wm::WindowState* window_state = wm::GetWindowState(native_window_);
   // Auto hide the shelf in immersive fullscreen instead of hiding it.
-  wm::GetWindowState(native_window_)->set_hide_shelf_when_fullscreen(!enabled);
+  window_state->set_hide_shelf_when_fullscreen(!enabled);
+
+  // Update the window's immersive mode state for the window manager.
+  window_state->set_in_immersive_fullscreen(enabled);
+
   Shell::GetInstance()->UpdateShelfVisibility();
 
   if (enabled_) {
     // Animate enabling immersive mode by sliding out the top-of-window views.
     // No animation occurs if a lock is holding the top-of-window views open.
 
     // Do a reveal to set the initial state for the animation. (And any
     // required state in case the animation cannot run because of a lock holding
     // the top-of-window views open.)
     MaybeStartReveal(ANIMATE_NO);
@@ skipping 654 matching lines @@
         AsBubbleDelegate(transient_child);
     if (bubble_delegate &&
         bubble_delegate->GetAnchorView() &&
         top_container_->Contains(bubble_delegate->GetAnchorView())) {
       bubble_manager_->StartObserving(transient_child);
     }
   }
 }
 
 }  // namespace ash