diff options
author | ben@chromium.org <ben@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-06-22 22:44:38 +0000 |
---|---|---|
committer | ben@chromium.org <ben@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-06-22 22:44:38 +0000 |
commit | 8f90afd7751345b1b86e15355dffb35aae76110e (patch) | |
tree | f0aac6c51753b5359c576bfc7a232b4b1849d079 /chrome/browser/task_manager_browsertest.cc | |
parent | e42a3b7d1233096f25a570bc4bad7acc2f2fee0b (diff) | |
download | chromium_src-8f90afd7751345b1b86e15355dffb35aae76110e.zip chromium_src-8f90afd7751345b1b86e15355dffb35aae76110e.tar.gz chromium_src-8f90afd7751345b1b86e15355dffb35aae76110e.tar.bz2 |
Reorganize the way the task manager is constructed.
The BrowserWindow creates the task manager UI directly, which uses the TaskManager to populate itself.
BUG=none
TEST=none
Review URL: http://codereview.chromium.org/140044
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@18975 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/task_manager_browsertest.cc')
-rw-r--r-- | chrome/browser/task_manager_browsertest.cc | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/chrome/browser/task_manager_browsertest.cc b/chrome/browser/task_manager_browsertest.cc index 35aa462..8aa343f 100644 --- a/chrome/browser/task_manager_browsertest.cc +++ b/chrome/browser/task_manager_browsertest.cc @@ -4,18 +4,14 @@ #include "chrome/browser/task_manager.h" +#include "chrome/browser/browser.h" +#include "chrome/browser/browser_window.h" #include "chrome/test/in_process_browser_test.h" #include "testing/gtest/include/gtest/gtest.h" class TaskManagerBrowserTest : public InProcessBrowserTest { }; -// Regression test for http://crbug.com/11180 -IN_PROC_BROWSER_TEST_F(TaskManagerBrowserTest, OpenClose) { - TaskManager::Open(); - TaskManager::Close(); -} - IN_PROC_BROWSER_TEST_F(TaskManagerBrowserTest, ShutdownWhileOpen) { - TaskManager::Open(); + browser()->window()->ShowTaskManager(); } |