diff options
Diffstat (limited to 'chrome/browser/ui/cocoa/browser_window_cocoa.mm')
| -rw-r--r-- | chrome/browser/ui/cocoa/browser_window_cocoa.mm | 26 |
1 files changed, 24 insertions, 2 deletions
diff --git a/chrome/browser/ui/cocoa/browser_window_cocoa.mm b/chrome/browser/ui/cocoa/browser_window_cocoa.mm index 046e0aa..ded611c 100644 --- a/chrome/browser/ui/cocoa/browser_window_cocoa.mm +++ b/chrome/browser/ui/cocoa/browser_window_cocoa.mm @@ -36,7 +36,9 @@ #import "chrome/browser/ui/cocoa/theme_install_bubble_view.h" #import "chrome/browser/ui/cocoa/toolbar/toolbar_controller.h" #include "chrome/browser/ui/tab_contents/tab_contents_wrapper.h" +#include "chrome/browser/ui/webui/task_manager_dialog.h" #include "chrome/common/chrome_notification_types.h" +#include "chrome/common/chrome_switches.h" #include "chrome/common/pref_names.h" #include "content/browser/tab_contents/tab_contents.h" #include "content/common/native_web_keyboard_event.h" @@ -358,11 +360,31 @@ void BrowserWindowCocoa::ShowUpdateChromeDialog() { } void BrowserWindowCocoa::ShowTaskManager() { - TaskManagerMac::Show(false); +#if defined(WEBUI_TASK_MANAGER) + TaskManagerDialog::Show(); +#else + // Uses WebUI TaskManager when swiches is set. It is beta feature. + if (CommandLine::ForCurrentProcess() + ->HasSwitch(switches::kEnableWebUITaskManager)) { + TaskManagerDialog::Show(); + } else { + TaskManagerMac::Show(false); + } +#endif // defined(WEBUI_TASK_MANAGER) } void BrowserWindowCocoa::ShowBackgroundPages() { - TaskManagerMac::Show(true); +#if defined(WEBUI_TASK_MANAGER) + TaskManagerDialog::ShowBackgroundPages(); +#else + // Uses WebUI TaskManager when swiches is set. It is beta feature. + if (CommandLine::ForCurrentProcess() + ->HasSwitch(switches::kEnableWebUITaskManager)) { + TaskManagerDialog::ShowBackgroundPages(); + } else { + TaskManagerMac::Show(true); + } +#endif // defined(WEBUI_TASK_MANAGER) } void BrowserWindowCocoa::ShowBookmarkBubble(const GURL& url, |