Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(3369)

Unified Diff: chrome/browser/task_management/task_manager_browsertest.cc

Issue 1912773002: Remove the old task manager view (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Compile error 3 Created 4 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: chrome/browser/task_management/task_manager_browsertest.cc
diff --git a/chrome/browser/task_management/task_manager_browsertest.cc b/chrome/browser/task_management/task_manager_browsertest.cc
index 911463a1cccddc47323ebd20f8d1c23002cb6395..3c9e68f044c3dda850dee1bf969254e7a3c8f6bc 100644
--- a/chrome/browser/task_management/task_manager_browsertest.cc
+++ b/chrome/browser/task_management/task_manager_browsertest.cc
@@ -2,8 +2,6 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "chrome/browser/task_manager/task_manager.h"
-
#include <stddef.h>
#include "base/files/file_path.h"
@@ -22,6 +20,7 @@
#include "chrome/browser/notifications/notification_ui_manager.h"
#include "chrome/browser/profiles/profile.h"
#include "chrome/browser/task_management/task_manager_browsertest_util.h"
+#include "chrome/browser/task_management/task_manager_interface.h"
#include "chrome/browser/task_management/task_manager_tester.h"
#include "chrome/browser/ui/browser.h"
#include "chrome/browser/ui/browser_commands.h"
@@ -50,6 +49,10 @@
#include "ui/base/l10n/l10n_util.h"
#include "ui/base/page_transition_types.h"
+#if defined(OS_MACOSX)
+#include "chrome/browser/task_manager/task_manager.h"
+#endif // defined(OS_MACOSX)
+
using content::WebContents;
using task_management::browsertest_util::ColumnSpecifier;
using task_management::browsertest_util::MatchAboutBlankTab;
@@ -96,10 +99,12 @@ class TaskManagerBrowserTest : public ExtensionBrowserTest {
}
void Refresh() {
- // Refresh() isn't ever needed on the new task manager.
- if (switches::NewTaskManagerEnabled())
- return;
- TaskManager::GetInstance()->model()->Refresh();
+#if defined(OS_MACOSX)
+ // On Mac, the old task manager might still be used if we are not using mac
+ // views. Refresh() isn't ever needed on the new task manager.
+ if (!task_management::TaskManagerInterface::IsNewTaskManagerEnabled())
+ TaskManager::GetInstance()->model()->Refresh();
+#endif // defined(OS_MACOSX)
}
GURL GetTestURL() {

Powered by Google App Engine
This is Rietveld 408576698