Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(73)

Side by Side Diff: chrome/browser/ui/browser.h

Issue 6318001: Revert 71327 - Attempt at fixing crash in ProcessPendingTabs. With the curren... (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 9 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « no previous file | chrome/browser/ui/browser.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2010 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2010 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #ifndef CHROME_BROWSER_UI_BROWSER_H_ 5 #ifndef CHROME_BROWSER_UI_BROWSER_H_
6 #define CHROME_BROWSER_UI_BROWSER_H_ 6 #define CHROME_BROWSER_UI_BROWSER_H_
7 #pragma once 7 #pragma once
8 8
9 #include <map> 9 #include <map>
10 #include <set> 10 #include <set>
(...skipping 891 matching lines...) Expand 10 before | Expand all | Expand 10 after
902 void CancelWindowClose(); 902 void CancelWindowClose();
903 903
904 // Removes |tab| from the passed |set|. 904 // Removes |tab| from the passed |set|.
905 // Returns whether the tab was in the set in the first place. 905 // Returns whether the tab was in the set in the first place.
906 // TODO(beng): this method needs a better name! 906 // TODO(beng): this method needs a better name!
907 bool RemoveFromSet(UnloadListenerSet* set, TabContents* tab); 907 bool RemoveFromSet(UnloadListenerSet* set, TabContents* tab);
908 908
909 // Cleans up state appropriately when we are trying to close the browser and 909 // Cleans up state appropriately when we are trying to close the browser and
910 // the tab has finished firing its unload handler. We also use this in the 910 // the tab has finished firing its unload handler. We also use this in the
911 // cases where a tab crashes or hangs even if the beforeunload/unload haven't 911 // cases where a tab crashes or hangs even if the beforeunload/unload haven't
912 // successfully fired. If |process_now| is true |ProcessPendingTabs| is 912 // successfully fired.
913 // invoked immediately, otherwise it is invoked after a delay (PostTask). 913 void ClearUnloadState(TabContents* tab);
914 //
915 // Typically you'll want to pass in true for |process_now|. Passing in true
916 // may result in deleting |tab|. If you know that shouldn't happen (because of
917 // the state of the stack), pass in false.
918 void ClearUnloadState(TabContents* tab, bool process_now);
919 914
920 // In-progress download termination handling ///////////////////////////////// 915 // In-progress download termination handling /////////////////////////////////
921 916
922 // Called when the window is closing to check if potential in-progress 917 // Called when the window is closing to check if potential in-progress
923 // downloads should prevent it from closing. 918 // downloads should prevent it from closing.
924 // Returns true if the window can close, false otherwise. 919 // Returns true if the window can close, false otherwise.
925 bool CanCloseWithInProgressDownloads(); 920 bool CanCloseWithInProgressDownloads();
926 921
927 // Assorted utility functions /////////////////////////////////////////////// 922 // Assorted utility functions ///////////////////////////////////////////////
928 923
(...skipping 207 matching lines...) Expand 10 before | Expand all | Expand 10 after
1136 // and we install ourselves as an observer. 1131 // and we install ourselves as an observer.
1137 TabRestoreService* tab_restore_service_; 1132 TabRestoreService* tab_restore_service_;
1138 1133
1139 scoped_ptr<InstantController> instant_; 1134 scoped_ptr<InstantController> instant_;
1140 scoped_ptr<InstantUnloadHandler> instant_unload_handler_; 1135 scoped_ptr<InstantUnloadHandler> instant_unload_handler_;
1141 1136
1142 DISALLOW_COPY_AND_ASSIGN(Browser); 1137 DISALLOW_COPY_AND_ASSIGN(Browser);
1143 }; 1138 };
1144 1139
1145 #endif // CHROME_BROWSER_UI_BROWSER_H_ 1140 #endif // CHROME_BROWSER_UI_BROWSER_H_
OLDNEW
« no previous file with comments | « no previous file | chrome/browser/ui/browser.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698