summaryrefslogtreecommitdiffstats
path: root/chrome/browser/task_manager_win.cc
diff options
context:
space:
mode:
authorjcampan@chromium.org <jcampan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-06-05 20:17:58 +0000
committerjcampan@chromium.org <jcampan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-06-05 20:17:58 +0000
commit438dbefec4af6654205e526ffc92dda1cadef603 (patch)
treef62453f9f8822a70a1ded4be7c4fd420d8ee9482 /chrome/browser/task_manager_win.cc
parente44de5df0a30d8071e2b7d098c78a3de82ebfbf4 (diff)
downloadchromium_src-438dbefec4af6654205e526ffc92dda1cadef603.zip
chromium_src-438dbefec4af6654205e526ffc92dda1cadef603.tar.gz
chromium_src-438dbefec4af6654205e526ffc92dda1cadef603.tar.bz2
The table was deleted after the model and the table accesses the model in its destructor, causing a failure in the browser tests.
BUG=None TEST=Run the browser tests Review URL: http://codereview.chromium.org/118315 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@17762 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/task_manager_win.cc')
-rw-r--r--chrome/browser/task_manager_win.cc4
1 files changed, 4 insertions, 0 deletions
diff --git a/chrome/browser/task_manager_win.cc b/chrome/browser/task_manager_win.cc
index 166169d..48b6777 100644
--- a/chrome/browser/task_manager_win.cc
+++ b/chrome/browser/task_manager_win.cc
@@ -266,6 +266,10 @@ TaskManagerViewImpl::TaskManagerViewImpl(TaskManager* task_manager,
TaskManagerViewImpl::~TaskManagerViewImpl() {
// Delete child views now, while our table model still exists.
RemoveAllChildViews(true);
+
+ // Prevent the table from accessing the model as part of its destruction, as
+ // the model might already be destroyed.
+ tab_table_->SetModel(NULL);
}
void TaskManagerViewImpl::Init() {