Reset UnloadController::is_attempting_to_close_browser_ when the download-in-progress prompt is can…

chrome/browser/ui/fast_unload_controller.h

 // 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.
 
 #ifndef CHROME_BROWSER_UI_FAST_UNLOAD_CONTROLLER_H_
 #define CHROME_BROWSER_UI_FAST_UNLOAD_CONTROLLER_H_
 
 #include <set>
 
 #include "base/callback.h"
@@ skipping 91 matching lines @@
   // of tabs that need their BeforeUnloadHandlers fired.
   // TODO(beng): This seems like it could be private but it is used by
   //             AreAllBrowsersCloseable() in application_lifetime.cc. It seems
   //             very similar to ShouldCloseWindow() and some consolidation
   //             could be pursued.
   bool TabsNeedBeforeUnloadFired();
 
   // Returns true if all tabs' beforeunload/unload events have fired.
   bool HasCompletedUnloadProcessing() const;
 
+  // Clears all the state associated with processing tabs' beforeunload/unload
+  // events since the user cancelled closing the window.
+  void CancelWindowClose();

[sky, 2014/02/18 21:24:00]

move implementations to match.

[benjhayden, 2014/02/18 22:11:34]

Done.

+
  private:
   // Overridden from content::NotificationObserver:
   virtual void Observe(int type,
                        const content::NotificationSource& source,
                        const content::NotificationDetails& details) OVERRIDE;
 
   // Overridden from TabStripModelObserver:
   virtual void TabInsertedAt(content::WebContents* contents,
                              int index,
                              bool foreground) OVERRIDE;
   virtual void TabDetachedAt(content::WebContents* contents,
                              int index) OVERRIDE;
   virtual void TabReplacedAt(TabStripModel* tab_strip_model,
                              content::WebContents* old_contents,
                              content::WebContents* new_contents,
                              int index) OVERRIDE;
   virtual void TabStripEmpty() OVERRIDE;
 
   void TabAttachedImpl(content::WebContents* contents);
   void TabDetachedImpl(content::WebContents* contents);
 
   // Detach |contents| and wait for it to finish closing.
   // The close must be inititiated outside of this method.
   // Returns true if it succeeds.
   bool DetachWebContents(content::WebContents* contents);
 
   // Processes the next tab that needs it's beforeunload/unload event fired.
   void ProcessPendingTabs();
 
-  // Clears all the state associated with processing tabs' beforeunload/unload
-  // events since the user cancelled closing the window.
-  void CancelWindowClose();
-
   // Cleans up state appropriately when we are trying to close the
   // browser or close a tab in the background. We also use this in the
   // cases where a tab crashes or hangs even if the
   // beforeunload/unload haven't successfully fired.
   void ClearUnloadState(content::WebContents* contents);
 
   // Helper for |ClearUnloadState| to unwind stack before proceeding.
   void PostTaskForProcessPendingTabs();
 
   // Log a step of the unload processing.
@@ skipping 42 matching lines @@
   scoped_ptr<DetachedWebContentsDelegate> detached_delegate_;
 
   base::WeakPtrFactory<FastUnloadController> weak_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(FastUnloadController);
 };
 
 }  // namespace chrome
 
 #endif  // CHROME_BROWSER_UI_FAST_UNLOAD_CONTROLLER_H_