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

chrome/browser/ui/views/frame/browser_view.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/browser_view.h"
 
 #include <algorithm>
 
 #include "base/auto_reset.h"
 #include "base/command_line.h"
@@ skipping 980 matching lines @@
 void BrowserView::SetFocusToLocationBar(bool select_all) {
   // On Windows, changing focus to the location bar causes the browser
   // window to become active. This can steal focus if the user has
   // another window open already. On ChromeOS, changing focus makes a
   // view believe it has a focus even if the widget doens't have a
   // focus. Either cases, we need to ignore this when the browser
   // window isn't active.
   if (!force_location_bar_focus_ && !IsActive())
     return;
 
-  // The location bar view must be visible for it to be considered focusable,
-  // so always reveal it before testing for focusable.
-  immersive_mode_controller_->MaybeStartReveal();
+  // Temporarily reveal the top-of-window views (if not already revealed) so
+  // that the location bar view is visible and is considered focusable. If the
+  // location bar view gains focus, |immersive_mode_controller_| will keep the
+  // top-of-window views revealed.
+  scoped_ptr<ImmersiveModeController::RevealedLock> focus_reveal_lock(
+      immersive_mode_controller_->GetRevealedLock());
 
   LocationBarView* location_bar = GetLocationBarView();
   if (location_bar->IsLocationEntryFocusableInRootView()) {
     // Location bar got focus.
     location_bar->FocusLocation(select_all);
   } else {
     // If none of location bar got focus,
     // then clear focus.
     views::FocusManager* focus_manager = GetFocusManager();
     DCHECK(focus_manager);
     focus_manager->ClearFocus();
-    // The view doesn't need to be revealed after all.

[James Cook, 2013/04/10 23:41:29]

Ooh, cleaning this up is nice!

-    immersive_mode_controller_->CancelReveal();
   }
 }
 
 void BrowserView::UpdateReloadStopState(bool is_loading, bool force) {
   toolbar_->reload_button()->ChangeMode(
       is_loading ? ReloadButton::MODE_STOP : ReloadButton::MODE_RELOAD, force);
 }
 
 void BrowserView::UpdateToolbar(content::WebContents* contents,
                                 bool should_restore_state) {
   toolbar_->Update(contents, should_restore_state);
 }
 
 void BrowserView::FocusToolbar() {
-  immersive_mode_controller_->MaybeStartReveal();
+  // Temporarily reveal the top-of-window views (if not already revealed) so
+  // that the toolbar is visible and is considered focusable. If the
+  // toolbar gains focus, |immersive_mode_controller_| will keep the
+  // top-of-window views revealed.
+  scoped_ptr<ImmersiveModeController::RevealedLock> focus_reveal_lock(
+      immersive_mode_controller_->GetRevealedLock());
+
   // Start the traversal within the main toolbar. SetPaneFocus stores
   // the current focused view before changing focus.
   toolbar_->SetPaneFocus(NULL);
 }
 
 void BrowserView::FocusBookmarksToolbar() {
-  // Don't use IsBookmarkBarVisible() because that might return false in
-  // immersive fullscreen and shifting focus should cause a reveal.
+  DCHECK(!immersive_mode_controller_->IsEnabled());
   if (bookmark_bar_view_.get() &&
       bookmark_bar_view_->visible() &&
       bookmark_bar_view_->GetPreferredSize().height() != 0) {
-    immersive_mode_controller_->MaybeStartReveal();
     bookmark_bar_view_->SetPaneFocus(bookmark_bar_view_.get());
   }
 }
 
 void BrowserView::FocusAppMenu() {
   // Chrome doesn't have a traditional menu bar, but it has a menu button in the
   // main toolbar that plays the same role.  If the user presses a key that
   // would typically focus the menu bar, tell the toolbar to focus the menu
   // button.  If the user presses the key again, return focus to the previous
   // location.
   //
   // Not used on the Mac, which has a normal menu bar.
   if (toolbar_->IsAppMenuFocused()) {
     RestoreFocus();
   } else {
-    immersive_mode_controller_->MaybeStartReveal();
+    DCHECK(!immersive_mode_controller_->IsEnabled());
     toolbar_->SetPaneFocusAndFocusAppMenu();
   }
 }
 
 void BrowserView::RotatePaneFocus(bool forwards) {
   // This gets called when the user presses F6 (forwards) or Shift+F6
   // (backwards) to rotate to the next pane. Here, our "panes" are the
   // tab contents and each of our accessible toolbars, infobars, downloads
   // shelf, etc.  When a pane has focus, all of its controls are accessible
   // in the tab traversal, and the tab traversal is "trapped" within that pane.
@@ skipping 1648 matching lines @@
 
   Browser* modal_browser =
       chrome::FindBrowserWithWebContents(active_dialog->web_contents());
   if (modal_browser && (browser_ != modal_browser)) {
     modal_browser->window()->FlashFrame(true);
     modal_browser->window()->Activate();
   }
 
   AppModalDialogQueue::GetInstance()->ActivateModalDialog();
 }