Index: chrome/browser/ui/cocoa/browser_window_cocoa.mm |
diff --git a/chrome/browser/ui/cocoa/browser_window_cocoa.mm b/chrome/browser/ui/cocoa/browser_window_cocoa.mm |
index ec84653cd1cc0f916247dd1f2ef897d77dd224b3..f0595e50f6c3afafcc85e23b94770649d0872c0b 100644 |
--- a/chrome/browser/ui/cocoa/browser_window_cocoa.mm |
+++ b/chrome/browser/ui/cocoa/browser_window_cocoa.mm |
@@ -35,7 +35,6 @@ |
#import "chrome/browser/ui/cocoa/toolbar/toolbar_controller.h" |
#include "chrome/browser/ui/page_info_bubble.h" |
#include "chrome/browser/ui/tab_contents/tab_contents_wrapper.h" |
-#include "chrome/browser/ui/webui/task_manager/task_manager_dialog.h" |
#include "chrome/common/chrome_notification_types.h" |
#include "chrome/common/pref_names.h" |
#include "content/public/browser/notification_source.h" |
@@ -416,29 +415,11 @@ void BrowserWindowCocoa::ShowUpdateChromeDialog() { |
} |
void BrowserWindowCocoa::ShowTaskManager() { |
-#if defined(WEBUI_TASK_MANAGER) |
- TaskManagerDialog::Show(); |
-#else |
- // Uses WebUI TaskManager when swiches is set. It is beta feature. |
- if (TaskManagerDialog::UseWebUITaskManager()) { |
- TaskManagerDialog::Show(); |
- } else { |
- TaskManagerMac::Show(false); |
- } |
-#endif // defined(WEBUI_TASK_MANAGER) |
+ TaskManagerMac::Show(false); |
} |
void BrowserWindowCocoa::ShowBackgroundPages() { |
-#if defined(WEBUI_TASK_MANAGER) |
- TaskManagerDialog::ShowBackgroundPages(); |
-#else |
- // Uses WebUI TaskManager when swiches is set. It is beta feature. |
- if (TaskManagerDialog::UseWebUITaskManager()) { |
- TaskManagerDialog::ShowBackgroundPages(); |
- } else { |
- TaskManagerMac::Show(true); |
- } |
-#endif // defined(WEBUI_TASK_MANAGER) |
+ TaskManagerMac::Show(true); |
} |
void BrowserWindowCocoa::ShowBookmarkBubble(const GURL& url, |