| Index: chrome/common/chrome_switches.cc
|
| diff --git a/chrome/common/chrome_switches.cc b/chrome/common/chrome_switches.cc
|
| index 73736474304c5be2ad4d2d951e971c3f042e5bde..d7de9551beeeaf2e66ce2be37abe8b9bdfd7801c 100644
|
| --- a/chrome/common/chrome_switches.cc
|
| +++ b/chrome/common/chrome_switches.cc
|
| @@ -1231,11 +1231,6 @@ const char kIpcFuzzerTestcase[] = "ipc-fuzzer-testcase";
|
| const char kDebugPrint[] = "debug-print";
|
| #endif
|
|
|
| -#if defined(ENABLE_TASK_MANAGER)
|
| -// Disables the new implementation of the task manager.
|
| -const char kDisableNewTaskManager[] = "disable-new-task-manager";
|
| -#endif // defined(ENABLE_TASK_MANAGER)
|
| -
|
| #if defined(ENABLE_WAYLAND_SERVER)
|
| // Enables Wayland display server support.
|
| const char kEnableWaylandServer[] = "enable-wayland-server";
|
| @@ -1319,17 +1314,6 @@ bool PowerOverlayEnabled() {
|
| }
|
| #endif
|
|
|
| -#if defined(ENABLE_TASK_MANAGER)
|
| -bool NewTaskManagerEnabled() {
|
| -#if defined(OS_MACOSX)
|
| - return false; // The new task manager hasn't been adopted on Mac yet.
|
| -#else
|
| - return !base::CommandLine::ForCurrentProcess()->HasSwitch(
|
| - kDisableNewTaskManager);
|
| -#endif // defined(OS_MACOSX)
|
| -}
|
| -#endif // defined(ENABLE_TASK_MANAGER)
|
| -
|
| // -----------------------------------------------------------------------------
|
| // DO NOT ADD YOUR CRAP TO THE BOTTOM OF THIS FILE.
|
| //
|
|
|