summaryrefslogtreecommitdiffstats
path: root/chrome/browser/task_manager/task_manager_browsertest.cc
diff options
context:
space:
mode:
authorrobertshield@chromium.org <robertshield@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-12-21 07:27:54 +0000
committerrobertshield@chromium.org <robertshield@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-12-21 07:27:54 +0000
commitddeb0e8430927a8f4a8300773729e1c0c2aead8f (patch)
treed6cb72b3128959785723c4bc1060fd7e40f8c91a /chrome/browser/task_manager/task_manager_browsertest.cc
parent1d3e0f5c331649d0a52ae6446814083d9cc77b9d (diff)
downloadchromium_src-ddeb0e8430927a8f4a8300773729e1c0c2aead8f.zip
chromium_src-ddeb0e8430927a8f4a8300773729e1c0c2aead8f.tar.gz
chromium_src-ddeb0e8430927a8f4a8300773729e1c0c2aead8f.tar.bz2
Remove last remaining call to FindOrCreateTabbedBrowser(). Fix up presubmit check.
BUG=129187 TEST=NONE Review URL: https://chromiumcodereview.appspot.com/11554003 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@174348 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/task_manager/task_manager_browsertest.cc')
-rw-r--r--chrome/browser/task_manager/task_manager_browsertest.cc28
1 files changed, 14 insertions, 14 deletions
diff --git a/chrome/browser/task_manager/task_manager_browsertest.cc b/chrome/browser/task_manager/task_manager_browsertest.cc
index 3bdc277..af2454f 100644
--- a/chrome/browser/task_manager/task_manager_browsertest.cc
+++ b/chrome/browser/task_manager/task_manager_browsertest.cc
@@ -88,7 +88,7 @@ class TaskManagerBrowserTest : public ExtensionBrowserTest {
// Regression test for http://crbug.com/13361
IN_PROC_BROWSER_TEST_F(TaskManagerBrowserTest, MAYBE_ShutdownWhileOpen) {
- browser()->window()->ShowTaskManager();
+ browser()->window()->ShowTaskManager(chrome::HOST_DESKTOP_TYPE_NATIVE);
}
IN_PROC_BROWSER_TEST_F(TaskManagerBrowserTest, NoticeTabContentsChanges) {
@@ -96,7 +96,7 @@ IN_PROC_BROWSER_TEST_F(TaskManagerBrowserTest, NoticeTabContentsChanges) {
// Show the task manager. This populates the model, and helps with debugging
// (you see the task manager).
- browser()->window()->ShowTaskManager();
+ browser()->window()->ShowTaskManager(chrome::HOST_DESKTOP_TYPE_NATIVE);
// New Tab Page.
TaskManagerBrowserTestUtil::WaitForWebResourceChange(1);
@@ -136,7 +136,7 @@ IN_PROC_BROWSER_TEST_F(TaskManagerBrowserTest, MAYBE_NoticePanelChanges) {
// Show the task manager. This populates the model, and helps with debugging
// (you see the task manager).
- browser()->window()->ShowTaskManager();
+ browser()->window()->ShowTaskManager(chrome::HOST_DESKTOP_TYPE_NATIVE);
// New Tab Page.
TaskManagerBrowserTestUtil::WaitForWebResourceChange(1);
@@ -183,7 +183,7 @@ IN_PROC_BROWSER_TEST_F(TaskManagerBrowserTest, NoticeBGContentsChanges) {
// Show the task manager. This populates the model, and helps with debugging
// (you see the task manager).
- browser()->window()->ShowTaskManager();
+ browser()->window()->ShowTaskManager(chrome::HOST_DESKTOP_TYPE_NATIVE);
// New Tab Page.
TaskManagerBrowserTestUtil::WaitForWebResourceChange(1);
@@ -214,7 +214,7 @@ IN_PROC_BROWSER_TEST_F(TaskManagerBrowserTest, KillBGContents) {
// Show the task manager. This populates the model, and helps with debugging
// (you see the task manager).
- browser()->window()->ShowTaskManager();
+ browser()->window()->ShowTaskManager(chrome::HOST_DESKTOP_TYPE_NATIVE);
// New Tab Page.
TaskManagerBrowserTestUtil::WaitForWebResourceChange(1);
@@ -270,7 +270,7 @@ IN_PROC_BROWSER_TEST_F(TaskManagerBrowserTest, MAYBE_KillPanelExtension) {
// Show the task manager. This populates the model, and helps with debugging
// (you see the task manager).
- browser()->window()->ShowTaskManager();
+ browser()->window()->ShowTaskManager(chrome::HOST_DESKTOP_TYPE_NATIVE);
// New Tab Page.
TaskManagerBrowserTestUtil::WaitForWebResourceChange(1);
@@ -309,7 +309,7 @@ IN_PROC_BROWSER_TEST_F(TaskManagerBrowserTest, NoticeExtensionChanges) {
// Show the task manager. This populates the model, and helps with debugging
// (you see the task manager).
- browser()->window()->ShowTaskManager();
+ browser()->window()->ShowTaskManager(chrome::HOST_DESKTOP_TYPE_NATIVE);
// New Tab Page.
TaskManagerBrowserTestUtil::WaitForWebResourceChange(1);
@@ -330,7 +330,7 @@ IN_PROC_BROWSER_TEST_F(TaskManagerBrowserTest, NoticeExtensionChanges) {
IN_PROC_BROWSER_TEST_F(TaskManagerBrowserTest, NoticeExtensionTabs) {
// Show the task manager. This populates the model, and helps with debugging
// (you see the task manager).
- browser()->window()->ShowTaskManager();
+ browser()->window()->ShowTaskManager(chrome::HOST_DESKTOP_TYPE_NATIVE);
// Wait for loading of task manager.
TaskManagerBrowserTestUtil::WaitForWebResourceChange(1);
@@ -376,7 +376,7 @@ IN_PROC_BROWSER_TEST_F(TaskManagerBrowserTest, NoticeExtensionTabs) {
IN_PROC_BROWSER_TEST_F(TaskManagerBrowserTest, NoticeAppTabs) {
// Show the task manager. This populates the model, and helps with debugging
// (you see the task manager).
- browser()->window()->ShowTaskManager();
+ browser()->window()->ShowTaskManager(chrome::HOST_DESKTOP_TYPE_NATIVE);
// Wait for loading of task manager.
TaskManagerBrowserTestUtil::WaitForWebResourceChange(1);
@@ -415,7 +415,7 @@ IN_PROC_BROWSER_TEST_F(TaskManagerBrowserTest, NoticeAppTabs) {
IN_PROC_BROWSER_TEST_F(TaskManagerBrowserTest, NoticeHostedAppTabs) {
// Show the task manager. This populates the model, and helps with debugging
// (you see the task manager).
- browser()->window()->ShowTaskManager();
+ browser()->window()->ShowTaskManager(chrome::HOST_DESKTOP_TYPE_NATIVE);
// New Tab Page.
TaskManagerBrowserTestUtil::WaitForWebResourceChange(1);
@@ -473,7 +473,7 @@ IN_PROC_BROWSER_TEST_F(TaskManagerBrowserTest, MAYBE_KillExtension) {
EXPECT_EQ(0, TaskManager::GetBackgroundPageCount());
// Show the task manager. This populates the model, and helps with debugging
// (you see the task manager).
- browser()->window()->ShowTaskManager();
+ browser()->window()->ShowTaskManager(chrome::HOST_DESKTOP_TYPE_NATIVE);
// Wait for loading of task manager.
TaskManagerBrowserTestUtil::WaitForWebResourceChange(1);
@@ -502,7 +502,7 @@ IN_PROC_BROWSER_TEST_F(TaskManagerBrowserTest,
DISABLED_KillExtensionAndReload) {
// Show the task manager. This populates the model, and helps with debugging
// (you see the task manager).
- browser()->window()->ShowTaskManager();
+ browser()->window()->ShowTaskManager(chrome::HOST_DESKTOP_TYPE_NATIVE);
// Wait for loading of task manager.
TaskManagerBrowserTestUtil::WaitForWebResourceChange(1);
@@ -545,7 +545,7 @@ IN_PROC_BROWSER_TEST_F(TaskManagerBrowserTest,
IN_PROC_BROWSER_TEST_F(TaskManagerBrowserTest, MAYBE_ReloadExtension) {
// Show the task manager. This populates the model, and helps with debugging
// (you see the task manager).
- browser()->window()->ShowTaskManager();
+ browser()->window()->ShowTaskManager(chrome::HOST_DESKTOP_TYPE_NATIVE);
// Wait for loading of task manager.
TaskManagerBrowserTestUtil::WaitForWebResourceChange(1);
@@ -593,7 +593,7 @@ IN_PROC_BROWSER_TEST_F(TaskManagerBrowserTest,
// Show the task manager. This populates the model, and helps with debugging
// (you see the task manager).
- browser()->window()->ShowTaskManager();
+ browser()->window()->ShowTaskManager(chrome::HOST_DESKTOP_TYPE_NATIVE);
// New Tab Page.
TaskManagerBrowserTestUtil::WaitForWebResourceChange(1);