Fix bugs wrt to immrsive mode being disabled

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 "ash/ash_switches.h"
 #include "ash/shell.h"
 #include "ash/wm/window_properties.h"
 #include "base/command_line.h"
@@ skipping 104 matching lines @@
   // If the top-of-window views are revealed (or become revealed), |widget| will
   // keep the top-of-window views revealed till |widget| is hidden or
   // RemoveAnchoredWidget() is called.
   void AddAnchoredWidget(views::Widget* widget, int y_offset);
 
   // Stops managing |widget|'s y position.
   // Closes the top-of-window views if no locks or other anchored widgets are
   // keeping the top-of-window views revealed.
   void RemoveAnchoredWidget(views::Widget* widget);
 
-  // Adjusts the y positions of the anchored widgets for the new top container
-  // bounds.
-  void OnTopContainerBoundsChanged();
+  // Repositions the anchored widgets for the current top container bounds if
+  // immersive mode is enabled.
+  void MaybeRepositionAnchoredWidgets();
+
+  // Called when immersive mode has been enabled.
+  void OnImmersiveModeEnabled();
 
   const std::set<views::Widget*>& visible_anchored_widgets() const {
     return visible_;
   }
 
  private:
   // Updates |revealed_lock_| based on the visible anchored widgets.
   void UpdateRevealedLock();
 
   // Updates the y position of |widget| given |y_offset| and the top
@@ skipping 58 matching lines @@
     return;
 
   widget->RemoveObserver(this);
   widgets_.erase(widget);
   visible_.erase(widget);
 
   UpdateRevealedLock();
 }
 
 void ImmersiveModeControllerAsh::AnchoredWidgetManager::
-    OnTopContainerBoundsChanged() {
+    MaybeRepositionAnchoredWidgets() {
   for (std::map<views::Widget*, int>::iterator it = widgets_.begin();
        it != widgets_.end(); ++it) {
     UpdateWidgetBounds(it->first, it->second);
   }
 
   UpdateRevealedLock();
 }
 
+void ImmersiveModeControllerAsh::AnchoredWidgetManager::
+    OnImmersiveModeEnabled() {
+  UpdateRevealedLock();
+  // The top container bounds may have changed while immersive mode was
+  // disabled.
+  MaybeRepositionAnchoredWidgets();
+}
+
 void ImmersiveModeControllerAsh::AnchoredWidgetManager::UpdateRevealedLock() {
   if (visible_.empty()) {
     revealed_lock_.reset();
   } else if (controller_->IsRevealed()) {
     // It is hard to determine the required initial transforms and the required
     // durations of the animations of |visible_| such that they appear to be
     // anchored to the top-of-window views while the top-of-window views are
     // animating. Skip to the end of the reveal animation instead.
     // We do not query the controller's reveal state because we may be called
     // as a result of LayoutBrowserView() in MaybeStartReveal() when
     // |reveal_state_| is SLIDING_OPEN but no animation is running yet.
     ui::Layer* top_container_layer =
         controller_->browser_view_->top_container()->layer();
     if (top_container_layer &&
         top_container_layer->GetAnimator()->is_animating()) {
       controller_->MaybeRevealWithoutAnimation();
     }
 
     if (!revealed_lock_.get())
       revealed_lock_.reset(controller_->GetRevealedLock());
   }
 }
 
 void ImmersiveModeControllerAsh::AnchoredWidgetManager::UpdateWidgetBounds(
     views::Widget* widget,
     int y_offset) {
-  if (!widget->IsVisible())
+  if (!controller_->IsEnabled() || !widget->IsVisible())
     return;
 
   gfx::Rect top_container_target_bounds =
       controller_->browser_view_->top_container()->GetTargetBoundsInScreen();
   gfx::Rect bounds(widget->GetWindowBoundsInScreen());
   bounds.set_y(
       top_container_target_bounds.bottom() + y_offset);
    widget->SetBounds(bounds);
 }
 
@@ skipping 123 matching lines @@
   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);
 
     // Reset the mouse and the focus revealed locks so that they do not affect
-    // whether the top-of-window views are hidden. Reacquire the locks if ending
-    // the reveal is unsuccessful.
-    bool had_mouse_revealed_lock = (mouse_revealed_lock_.get() != NULL);
-    bool had_focus_revealed_lock = (focus_revealed_lock_.get() != NULL);
+    // whether the top-of-window views are hidden.
     mouse_revealed_lock_.reset();
     focus_revealed_lock_.reset();
 
     // Try doing the animation.
     MaybeEndReveal(ANIMATE_SLOW);
 
-    if (IsRevealed()) {
-      if (had_mouse_revealed_lock)
-        mouse_revealed_lock_.reset(GetRevealedLock());
-      if (had_focus_revealed_lock)
-        focus_revealed_lock_.reset(GetRevealedLock());
+    if (reveal_state_ == REVEALED) {
+      // Reveal was unsuccessful. Reacquire the revealed locks if appropriate.
+      UpdateMouseRevealedLock(true);
+      UpdateFocusRevealedLock();
     }
+    anchored_widget_manager_->OnImmersiveModeEnabled();
   } else {
     // Stop cursor-at-top tracking.
     top_timer_.Stop();
     // Snap immediately to the closed state.
     reveal_state_ = CLOSED;
     EnablePaintToLayer(false);
     browser_view_->GetWidget()->non_client_view()->frame_view()->
         ResetWindowControls();
     browser_view_->tabstrip()->SetImmersiveStyle(false);
   }
@@ skipping 43 matching lines @@
     int y_offset) {
   anchored_widget_manager_->AddAnchoredWidget(widget, y_offset);
 }
 
 void ImmersiveModeControllerAsh::UnanchorWidgetFromTopContainer(
     views::Widget* widget) {
   anchored_widget_manager_->RemoveAnchoredWidget(widget);
 }
 
 void ImmersiveModeControllerAsh::OnTopContainerBoundsChanged() {
-  anchored_widget_manager_->OnTopContainerBoundsChanged();
+  anchored_widget_manager_->MaybeRepositionAnchoredWidgets();
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // Observers:
 
 void ImmersiveModeControllerAsh::OnMouseEvent(ui::MouseEvent* event) {
   if (!enabled_)
     return;
 
   if (event->flags() & ui::EF_IS_SYNTHESIZED)
@@ skipping 363 matching lines @@
   ui::ScopedLayerAnimationSettings settings(layer->GetAnimator());
   settings.SetTweenType(ui::Tween::EASE_OUT);
   settings.SetTransitionDuration(
       base::TimeDelta::FromMilliseconds(duration_ms));
   settings.SetPreemptionStrategy(
       ui::LayerAnimator::IMMEDIATELY_ANIMATE_TO_NEW_TARGET);
   if (observer)
     settings.AddObserver(observer);
   layer->SetTransform(target_transform);
 }