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

Unified Diff: chrome/browser/ui/cocoa/task_manager_mac.mm

Issue 2724923004: cocoa: add --use-views-task-manager (Closed)
Patch Set: use a base::Feature Created 3 years, 9 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/ui/cocoa/task_manager_mac.mm
diff --git a/chrome/browser/ui/cocoa/task_manager_mac.mm b/chrome/browser/ui/cocoa/task_manager_mac.mm
index 178681ab230a6f625c119ebee54dc5451fbf01e1..57ea4c8ae279359abffdae73d3cc52a056203c35 100644
--- a/chrome/browser/ui/cocoa/task_manager_mac.mm
+++ b/chrome/browser/ui/cocoa/task_manager_mac.mm
@@ -9,6 +9,8 @@
#include <algorithm>
#include <vector>
+#include "base/command_line.h"
tapted 2017/03/08 23:08:08 nit: remove
+#include "base/feature_list.h"
#include "base/mac/bundle_locations.h"
#include "base/macros.h"
#include "base/strings/sys_string_conversions.h"
@@ -19,6 +21,7 @@
#include "chrome/browser/ui/browser_dialogs.h"
#import "chrome/browser/ui/cocoa/window_size_autosaver.h"
#include "chrome/browser/ui/task_manager/task_manager_columns.h"
+#include "chrome/common/chrome_switches.h"
#include "chrome/common/pref_names.h"
#include "chrome/grit/generated_resources.h"
#include "components/prefs/pref_service.h"
@@ -35,6 +38,10 @@
return [NSString stringWithFormat:@"%d", id];
}
+bool ShouldUseViewsTaskManager() {
+ return base::FeatureList::IsEnabled(switches::kViewsTaskManager);
+}
+
} // namespace
@interface TaskManagerWindowController (Private)
@@ -639,10 +646,14 @@ - (NSButton*)endProcessButtonForTesting {
// Declared in browser_dialogs.h.
task_manager::TaskManagerTableModel* ShowTaskManager(Browser* browser) {
+ if (ShouldUseViewsTaskManager())
+ return chrome::ShowTaskManagerViews(browser);
return task_manager::TaskManagerMac::Show();
}
void HideTaskManager() {
+ if (ShouldUseViewsTaskManager())
+ return chrome::HideTaskManagerViews();
task_manager::TaskManagerMac::Hide();
}

Powered by Google App Engine
This is Rietveld 408576698