Remove ImmersiveModeController::MaybeStartReveal() / ImmersiveModeController::CancelReveal()

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 272 matching lines @@
 }
 
 void ImmersiveModeControllerAsh::MaybeStackViewAtTop() {
   if (enabled_ && reveal_state_ != CLOSED) {
     ui::Layer* reveal_layer = browser_view_->top_container()->layer();
     if (reveal_layer)
       reveal_layer->parent()->StackAtTop(reveal_layer);
   }
 }
 
-void ImmersiveModeControllerAsh::MaybeStartReveal() {
-  if (enabled_ && reveal_state_ != REVEALED)
-    StartReveal(ANIMATE_FAST);
-}
-
-void ImmersiveModeControllerAsh::CancelReveal() {
-  // Reset the mouse revealed lock so that it does not affect whether
-  // the top-of-window views are hidden. Reaquire the lock if ending the reveal
-  // is unsuccessful.
-  bool had_mouse_revealed_lock = (mouse_revealed_lock_.get() != NULL);
-  mouse_revealed_lock_.reset();
-  MaybeEndReveal(ANIMATE_NO);
-  if (IsRevealed() && had_mouse_revealed_lock)
-    mouse_revealed_lock_.reset(GetRevealedLock());
-}
-
 ImmersiveModeControllerAsh::RevealedLock*
     ImmersiveModeControllerAsh::GetRevealedLock() {
   return new RevealedLockAsh(weak_ptr_factory_.GetWeakPtr());
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // Observers:
 
 void ImmersiveModeControllerAsh::OnMouseEvent(ui::MouseEvent* event) {
   if (!enabled_)
@@ skipping 79 matching lines @@
 void ImmersiveModeControllerAsh::SetMouseHoveredForTest(bool hovered) {
   views::View* top_container = browser_view_->top_container();
   gfx::Point cursor_pos;
   if (!hovered) {
     int bottom_edge = top_container->bounds().bottom();
     cursor_pos = gfx::Point(0, bottom_edge + 100);
   }
   views::View::ConvertPointToScreen(top_container, &cursor_pos);
   aura::Env::GetInstance()->set_last_mouse_location(cursor_pos);
 
-  UpdateMouseRevealedLock(true);
+  UpdateMouseRevealedLock(false);
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // private:
 
 void ImmersiveModeControllerAsh::EnableWindowObservers(bool enable) {
   if (!native_window_) {
     DCHECK(!enable) << "ImmersiveModeControllerAsh not initialized";
     return;
   }
@@ skipping 96 matching lines @@
       return 0;
     case ANIMATE_SLOW:
       return kRevealSlowAnimationDurationMs;
     case ANIMATE_FAST:
       return kRevealFastAnimationDurationMs;
   }
   NOTREACHED();
   return 0;
 }
 
+void ImmersiveModeControllerAsh::MaybeStartReveal() {
+  if (enabled_ && reveal_state_ != REVEALED)
+    StartReveal(ANIMATE_FAST);
+}
+
 void ImmersiveModeControllerAsh::StartReveal(Animate animate) {
   if (reveal_state_ == CLOSED) {
     reveal_state_ = SLIDING_OPEN;
     // Turn on layer painting so we can smoothly animate.
     EnablePaintToLayer(true);
 
     // Ensure window caption buttons are updated and the view bounds are
     // computed at normal (non-immersive-style) size.
     LayoutBrowserView(false);
 
@@ skipping 101 matching lines @@
 
 void ImmersiveModeControllerAsh::OnSlideClosedAnimationCompleted() {
   if (reveal_state_ == SLIDING_CLOSED) {
     reveal_state_ = CLOSED;
     // Layers aren't needed after animation completes.
     EnablePaintToLayer(false);
     // Update tabstrip for closed state.
     LayoutBrowserView(true);
   }
 }