DO NOT MERGE: Fix top_controls_manager to stay hidden

cc/input/top_controls_manager.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 "cc/input/top_controls_manager.h"
 
 #include <algorithm>
 
 #include "base/logging.h"
 #include "cc/animation/keyframed_animation_curve.h"
@@ skipping 149 matching lines @@
 
 void TopControlsManager::SetTopControlsHeight(float top_controls_height) {
   DCHECK_GE(top_controls_height, 0);
 
   if (top_controls_height == top_controls_height_)
     return;
 
   ResetAnimations();
   float top_controls_offset = client_->ControlsTopOffset();
   top_controls_height_ = top_controls_height;
+
+  // Stay hidden if only HIDDEN state is permitted.
+  if (permitted_state_ == HIDDEN)
+    top_controls_offset = -top_controls_height_;
+
   SetControlsTopOffset(top_controls_offset);
   StartAnimationIfNecessary();
 }
 
 gfx::Vector2dF TopControlsManager::Animate(base::TimeTicks monotonic_time) {
   if (!top_controls_animation_ || !client_->HaveRootScrollLayer())
     return gfx::Vector2dF();
 
   base::TimeDelta time = monotonic_time - base::TimeTicks();
 
@@ skipping 77 matching lines @@
 
   if ((animation_direction_ == SHOWING_CONTROLS && new_offset >= 0) ||
       (animation_direction_ == HIDING_CONTROLS
           && new_offset <= -top_controls_height_)) {
     return true;
   }
   return false;
 }
 
 }  // namespace cc