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

Unified Diff: chrome/browser/task_manager/legacy_task_manager_tester.cc

Issue 1912773002: Remove the old task manager view (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Nits 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_manager/legacy_task_manager_tester.cc
diff --git a/chrome/browser/task_manager/legacy_task_manager_tester.cc b/chrome/browser/task_manager/legacy_task_manager_tester.cc
index 09254edd68b8112b3d19ccbc711c5ed01b36f578..b1badb1bd8a9cbe495c54e2daa0fb9954c1f7991 100644
--- a/chrome/browser/task_manager/legacy_task_manager_tester.cc
+++ b/chrome/browser/task_manager/legacy_task_manager_tester.cc
@@ -2,17 +2,18 @@
// 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/legacy_task_manager_tester.h"
+#include "chrome/browser/task_management/task_manager_tester.h"
#include "base/memory/ptr_util.h"
#include "chrome/browser/sessions/session_tab_helper.h"
+#include "chrome/browser/task_management/task_manager_interface.h"
#include "chrome/browser/task_manager/resource_provider.h"
#include "chrome/browser/task_manager/task_manager.h"
#include "chrome/browser/ui/browser_dialogs.h"
#include "chrome/grit/generated_resources.h"
#include "extensions/strings/grit/extensions_strings.h"
-namespace task_manager {
+namespace {
class LegacyTaskManagerTester : public task_management::TaskManagerTester,
public TaskManagerModelObserver {
@@ -85,9 +86,23 @@ class LegacyTaskManagerTester : public task_management::TaskManagerTester,
TaskManagerModel* model_;
};
-std::unique_ptr<task_management::TaskManagerTester>
-CreateLegacyTaskManagerTester(const base::Closure& callback) {
+} // namespace
+
+namespace task_management {
+
+// static
+std::unique_ptr<TaskManagerTester> TaskManagerTester::Create(
+ const base::Closure& callback) {
+ if (TaskManagerInterface::IsNewTaskManagerEnabled())
+ return TaskManagerTester::CreateDefault(callback);
return base::WrapUnique(new LegacyTaskManagerTester(callback));
}
-} // namespace task_manager
+void TaskManagerTester::MaybeRefreshLegacyInstance() {
+ // 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 (!TaskManagerInterface::IsNewTaskManagerEnabled())
+ TaskManager::GetInstance()->model()->Refresh();
+}
+
+} // namespace task_management
« no previous file with comments | « chrome/browser/task_manager/legacy_task_manager_tester.h ('k') | chrome/browser/task_manager/printing_information.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698