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

chrome/browser/ui/unload_controller.h

 // Copyright (c) 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.
 
 #ifndef CHROME_BROWSER_UI_UNLOAD_CONTROLLER_H_
 #define CHROME_BROWSER_UI_UNLOAD_CONTROLLER_H_
 
 #include <set>
 
 #include "base/callback.h"
@@ skipping 60 matching lines @@
 
   // Returns true if |browser_| has any tabs that have BeforeUnload handlers
   // that have not been fired. This method is non-const because it builds a list
   // 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();
 
+  // Clears all the state associated with processing tabs' beforeunload/unload
+  // events since the user cancelled closing the window.
+  void CancelWindowClose();
+
  private:
   typedef std::set<content::WebContents*> UnloadListenerSet;
 
   // 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);
 
   // Processes the next tab that needs it's beforeunload/unload event fired.
   void ProcessPendingTabs();
 
   // Whether we've completed firing all the tabs' beforeunload/unload events.
   bool HasCompletedUnloadProcessing() const;
 
-  // Clears all the state associated with processing tabs' beforeunload/unload
-  // events since the user cancelled closing the window.
-  void CancelWindowClose();
-
   // Removes |web_contents| from the passed |set|.
   // Returns whether the tab was in the set in the first place.
   bool RemoveFromSet(UnloadListenerSet* set,
                      content::WebContents* web_contents);
 
   // Cleans up state appropriately when we are trying to close the browser and
   // the tab has finished firing its unload handler. We also use this in the
   // cases where a tab crashes or hangs even if the beforeunload/unload haven't
   // successfully fired. If |process_now| is true |ProcessPendingTabs| is
   // invoked immediately, otherwise it is invoked after a delay (PostTask).
@@ skipping 31 matching lines @@
   base::Callback<void(bool)> on_close_confirmed_;
 
   base::WeakPtrFactory<UnloadController> weak_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(UnloadController);
 };
 
 }  // namespace chrome
 
 #endif  // CHROME_BROWSER_UI_UNLOAD_CONTROLLER_H_