diff options
| author | ben@chromium.org <ben@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-06-03 21:07:08 +0000 |
|---|---|---|
| committer | ben@chromium.org <ben@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-06-03 21:07:08 +0000 |
| commit | 2a8a635f08dbc6bc47f41a2672b03edeb5219fca (patch) | |
| tree | 9173f0e69083af412de3e79140f3a391b8b1036b /chrome/browser/task_manager_win.cc | |
| parent | 5a7ba9b55910ce02c00ef43831d054d6ef7a311e (diff) | |
| download | chromium_src-2a8a635f08dbc6bc47f41a2672b03edeb5219fca.zip chromium_src-2a8a635f08dbc6bc47f41a2672b03edeb5219fca.tar.gz chromium_src-2a8a635f08dbc6bc47f41a2672b03edeb5219fca.tar.bz2 | |
Fix task manager by only adding the table view to the view hierarchy when the task manager view is added.
http://crbug.com/12927
TEST=open the task manager, should work
Review URL: http://codereview.chromium.org/119105
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@17532 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/task_manager_win.cc')
| -rw-r--r-- | chrome/browser/task_manager_win.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/chrome/browser/task_manager_win.cc b/chrome/browser/task_manager_win.cc index fcf6639..e88024d 100644 --- a/chrome/browser/task_manager_win.cc +++ b/chrome/browser/task_manager_win.cc @@ -318,8 +318,6 @@ void TaskManagerViewImpl::Init() { l10n_util::GetString(IDS_TASK_MANAGER_ABOUT_MEMORY_LINK))); about_memory_link_->SetController(this); - AddChildView(tab_table_); - // Makes sure our state is consistent. OnSelectionChanged(); } @@ -359,6 +357,8 @@ void TaskManagerViewImpl::ViewHierarchyChanged(bool is_add, if (is_add) { parent->AddChildView(kill_button_.get()); parent->AddChildView(about_memory_link_.get()); + if (tab_table_->GetParent() != this) + AddChildView(tab_table_); } else { parent->RemoveChildView(kill_button_.get()); parent->RemoveChildView(about_memory_link_.get()); |