summaryrefslogtreecommitdiffstats
path: root/chrome/browser/task_manager.h
diff options
context:
space:
mode:
authorphajdan.jr@chromium.org <phajdan.jr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-06-10 06:57:20 +0000
committerphajdan.jr@chromium.org <phajdan.jr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-06-10 06:57:20 +0000
commitddf94c33b530c55d0fc25abfc2ffa2a633b95832 (patch)
tree54437033ae833f07eb4ec523b237349199ce221c /chrome/browser/task_manager.h
parentc8471bd746e5e80c46e0fa282bef3a7792a453d3 (diff)
downloadchromium_src-ddf94c33b530c55d0fc25abfc2ffa2a633b95832.zip
chromium_src-ddf94c33b530c55d0fc25abfc2ffa2a633b95832.tar.gz
chromium_src-ddf94c33b530c55d0fc25abfc2ffa2a633b95832.tar.bz2
Destroy TaskManager's view when its window is closed.
TEST=Open the task manager. Close it. Open again and close. Browser should not crash. http://crbug.com/13361 Review URL: http://codereview.chromium.org/119299 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@18038 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/task_manager.h')
-rw-r--r--chrome/browser/task_manager.h5
1 files changed, 3 insertions, 2 deletions
diff --git a/chrome/browser/task_manager.h b/chrome/browser/task_manager.h
index c0eaa8b..c0f312e 100644
--- a/chrome/browser/task_manager.h
+++ b/chrome/browser/task_manager.h
@@ -130,7 +130,7 @@ class TaskManager {
~TaskManager();
- void Init();
+ void CreateView();
// Returns the singleton instance (and initializes it if necessary).
static TaskManager* GetInstance();
@@ -140,7 +140,7 @@ class TaskManager {
scoped_refptr<TaskManagerModel> model_;
// A container containing the buttons and table.
- scoped_ptr<TaskManagerView> view_;
+ TaskManagerView* view_;
DISALLOW_COPY_AND_ASSIGN(TaskManager);
};
@@ -356,6 +356,7 @@ class TaskManagerView {
virtual void GetFocused(std::vector<int>* focused) = 0;
virtual void OpenWindow() = 0;
+ virtual void ActivateWindow() = 0;
virtual void CloseWindow() = 0;
};