diff options
| author | sky@google.com <sky@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-08-28 22:33:36 +0000 |
|---|---|---|
| committer | sky@google.com <sky@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-08-28 22:33:36 +0000 |
| commit | a03a3b25f70f7cf8b061b32c04f0575625b1bc6e (patch) | |
| tree | 0c0bc76c4a1947202b571840bafee27b700f12d2 /chrome/browser/views/clear_browsing_data.h | |
| parent | 586f300066e3b683b83bcce1fd6fa660dc807ff4 (diff) | |
| download | chromium_src-a03a3b25f70f7cf8b061b32c04f0575625b1bc6e.zip chromium_src-a03a3b25f70f7cf8b061b32c04f0575625b1bc6e.tar.gz chromium_src-a03a3b25f70f7cf8b061b32c04f0575625b1bc6e.tar.bz2 | |
Fixes crash in ClearBrowsingDataView that can only occur during the
automated tests. If the window is closed while a removal is in
progress the BrowsingDataRemover would be left with a reference to a
deleted object. This can only happen during automated testing as
while clearing is in progress we don't allow the user to close the
dialog.
BUG=1138705
TEST=covered by automated test bot
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@1512 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/views/clear_browsing_data.h')
| -rw-r--r-- | chrome/browser/views/clear_browsing_data.h | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/chrome/browser/views/clear_browsing_data.h b/chrome/browser/views/clear_browsing_data.h index 56b063b..2b057a5 100644 --- a/chrome/browser/views/clear_browsing_data.h +++ b/chrome/browser/views/clear_browsing_data.h @@ -101,8 +101,11 @@ class ClearBrowsingDataView : public ChromeViews::View, Profile* profile_; + // If non-null it means removal is in progress. BrowsingDataRemover takes care + // of deleting itself when done. + BrowsingDataRemover* remover_; + DISALLOW_EVIL_CONSTRUCTORS(ClearBrowsingDataView); }; #endif // CHROME_BROWSER_VIEWS_CLEAR_BROWSING_DATA_H__ - |